wip: ci

Makefile

@@ -16,9 +16,6 @@ SPEC = dch-selinux.spec
 RPM = dch-selinux-$(VERSION)-$(RELEASE).$(ARCH).rpm
 SRPM = dch-selinux-$(VERSION)-$(RELEASE).src.rpm
 
-GITEA_URL = https://git.pyrocufflink.net
-GITEA_ORG = infra
-
 define buildpp
 	$(MAKE) NAME=$(NAME) -f /usr/share/selinux/devel/Makefile
 endef
@@ -68,14 +65,16 @@ endif
 	mock -r '$(MOCKTARGET)' $(SRPM)
 	cp -a /var/lib/mock/$(MOCKTARGET)/result/*.noarch.rpm .
 
-publish: $(RPM)
+publish: repo
-ifeq ($(GITEA_USERNAME),)
+ifeq ($(PUBLISH_HOST),)
-	$(error GITEA_USERNAME and GITEA_PASSWORD are required)
+	$(error PUBLISH_HOST and PUBLISH_PATH are required)
 endif
-	curl -f \
+	rsync -rtiO --delete $(REPO)/ $(PUBLISH_HOST):$(PUBLISH_PATH)
-		'$(GITEA_URL)/api/packages/$(GITEA_ORG)/rpm/upload' \
+
-		-u '$(GITEA_USERNAME):$(GITEA_PASSWORD)' \
+repo:
-		-T $<
+	mkdir -p '$(REPO)'
+	cp *.rpm '$(REPO)'/
+	createrepo '$(REPO)'
 
 rpm: $(RPM)
 

ci/Jenkinsfile

@@ -1,6 +1,10 @@
 // vim: set sw=4 ts=4 sts=4 et :
 
 pipeline {
+    environment {
+        GITEA_URL = 'https://git.pyrocufflink.net'
+    }
+
     agent {
         kubernetes {
             yamlFile 'ci/podTemplate.yaml'
@@ -19,10 +23,10 @@ pipeline {
             steps {
                 withCredentials([usernamePassword(
                     credentialsId: 'jenkins-packages',
-                    usernameVariable: 'GITEA_USERNAME',
+                    usernameVariable: 'USERNAME',
-                    passwordVariable: 'GITEA_PASSWORD',
+                    passwordVariable: 'PASSWORD',
                 )]) {
-                    sh 'make publish'
+                    sh 'curl -f -u "${USERNAME}:${PASSWORD}" -T *.rpm ${GITEA_URL}/api/packages/infra/rpm/upload'
                 }
             }
         }