Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: use a single Jenkinsfile for both ci.jenkins.io and infra.ci.jenkins.io #354

Merged
merged 13 commits into from
May 14, 2024
Merged
12 changes: 7 additions & 5 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
@Library('pipeline-library@pull/784/head') _

pipeline {
environment {
JAVA_HOME = '/opt/jdk-17'
}
agent {
label 'jdk17'
// infra.ci build on amd64 to be compliant with selenium
label 'jdk17 || linux-amd64-docker '
}
options {
disableConcurrentBuilds(abortPrevious: true)
Expand All @@ -14,7 +16,7 @@ pipeline {
sh './gradlew build -x test -x integrationTest'
}
}
stage('Test') {
stage('Test') {
steps {
sh './gradlew check'
}
Expand All @@ -34,7 +36,7 @@ pipeline {
rebuildImageOnPeriodicJob: false,
automaticSemanticVersioning: true,
targetplatforms: 'linux/amd64,linux/arm64',
disablePublication: true
disablePublication: !infra.isInfra()
])
}
}
Expand Down
5 changes: 0 additions & 5 deletions Jenkinsfile_k8s

This file was deleted.