CI Updates

jc21-rpm · Aug 31, 2021 · f88e48c · f88e48c
1 parent 907bfd0
commit f88e48c
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 98 deletions.
diff --git a/Jenkinsfile.centos7 b/Jenkinsfile.centos7
@@ -1,53 +1,45 @@
 @Library('jc21') _
 
 pipeline {
-  options {
-    buildDiscarder(logRotator(numToKeepStr: '10'))
-    disableConcurrentBuilds()
-  }
-  agent {
-    label 'rpm'
-  }
-  stages {
-    stage('Prepare') {
-      steps {
-        sh 'docker pull ${DOCKER_CI_TOOLS}'
-      }
-    }
-    stage('Build') {
-      steps {
-        ansiColor('xterm') {
-          sh './build 7 rust'
-        }
-      }
-    }
-    stage('Sign') {
-      steps {
-        ansiColor('xterm') {
-          rpmSign()
-        }
-      }
-    }
-    stage('Publish') {
-      steps {
-        dir(path: 'RPMS') {
-          archiveArtifacts(artifacts: '**/*/*.rpm', caseSensitive: true, onlyIfSuccessful: true)
-        }
-        dir(path: 'SRPMS') {
-          archiveArtifacts(artifacts: '**/*.src.rpm', caseSensitive: true, onlyIfSuccessful: true, allowEmptyArchive: true)
-        }
-        rpmGithubRelease('centos7')
-      }
-    }
-  }
-  post {
-    success {
-      juxtapose event: 'success'
-      sh 'figlet "SUCCESS"'
-    }
-    failure {
-      juxtapose event: 'failure'
-      sh 'figlet "FAILURE"'
-    }
-  }
+	options {
+		buildDiscarder(logRotator(numToKeepStr: '10'))
+		disableConcurrentBuilds()
+		ansiColor('xterm')
+	}
+	agent {
+		label 'rpmbuild'
+	}
+	stages {
+		stage('Build') {
+			steps {
+				sh './build 7 rust'
+			}
+		}
+		stage('Sign') {
+			steps {
+				rpmSign()
+			}
+		}
+		stage('Publish') {
+			steps {
+				dir(path: 'RPMS') {
+					archiveArtifacts(artifacts: '**/*/*.rpm', caseSensitive: true, onlyIfSuccessful: true)
+				}
+				dir(path: 'SRPMS') {
+					archiveArtifacts(artifacts: '**/*.src.rpm', caseSensitive: true, onlyIfSuccessful: true, allowEmptyArchive: true)
+				}
+				rpmGithubRelease('centos7')
+			}
+		}
+	}
+	post {
+		success {
+			juxtapose event: 'success'
+			sh 'figlet "SUCCESS"'
+		}
+		failure {
+			juxtapose event: 'failure'
+			sh 'figlet "FAILURE"'
+		}
+	}
 }
diff --git a/Jenkinsfile.centos8 b/Jenkinsfile.centos8
@@ -1,53 +1,45 @@
 @Library('jc21') _
 
 pipeline {
-  options {
-    buildDiscarder(logRotator(numToKeepStr: '10'))
-    disableConcurrentBuilds()
-  }
-  agent {
-    label 'rpm'
-  }
-  stages {
-    stage('Prepare') {
-      steps {
-        sh 'docker pull ${DOCKER_CI_TOOLS}'
-      }
-    }
-    stage('Build') {
-      steps {
-        ansiColor('xterm') {
-          sh './build 8 rust'
-        }
-      }
-    }
-    stage('Sign') {
-      steps {
-        ansiColor('xterm') {
-          rpmSign()
-        }
-      }
-    }
-    stage('Publish') {
-      steps {
-        dir(path: 'RPMS') {
-          archiveArtifacts(artifacts: '**/*/*.rpm', caseSensitive: true, onlyIfSuccessful: true)
-        }
-        dir(path: 'SRPMS') {
-          archiveArtifacts(artifacts: '**/*.src.rpm', caseSensitive: true, onlyIfSuccessful: true, allowEmptyArchive: true)
-        }
-        rpmGithubRelease('centos8')
-      }
-    }
-  }
-  post {
-    success {
-      juxtapose event: 'success'
-      sh 'figlet "SUCCESS"'
-    }
-    failure {
-      juxtapose event: 'failure'
-      sh 'figlet "FAILURE"'
-    }
-  }
+	options {
+		buildDiscarder(logRotator(numToKeepStr: '10'))
+		disableConcurrentBuilds()
+		ansiColor('xterm')
+	}
+	agent {
+		label 'rpmbuild'
+	}
+	stages {
+		stage('Build') {
+			steps {
+				sh './build 8 rust'
+			}
+		}
+		stage('Sign') {
+			steps {
+				rpmSign()
+			}
+		}
+		stage('Publish') {
+			steps {
+				dir(path: 'RPMS') {
+					archiveArtifacts(artifacts: '**/*/*.rpm', caseSensitive: true, onlyIfSuccessful: true)
+				}
+				dir(path: 'SRPMS') {
+					archiveArtifacts(artifacts: '**/*.src.rpm', caseSensitive: true, onlyIfSuccessful: true, allowEmptyArchive: true)
+				}
+				rpmGithubRelease('centos8')
+			}
+		}
+	}
+	post {
+		success {
+			juxtapose event: 'success'
+			sh 'figlet "SUCCESS"'
+		}
+		failure {
+			juxtapose event: 'failure'
+			sh 'figlet "FAILURE"'
+		}
+	}
 }