From fa4b6a88db1698921a1e382bf6a9b256da3abd4d Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Mon, 29 Jul 2019 13:35:20 +1000 Subject: [PATCH] Consolidate lf-infra-jjbini with JJB 2.0 There is no need to have two separate versions of the macro anymore since we are already on JJB 2.0 Change-Id: I2295489f8d0bebf9e1628db91c38e74d3839b8a0 Signed-off-by: Anil Belur --- docs/jjb/lf-ci-jobs.rst | 7 ------- jjb/lf-ci-jobs.yaml | 11 +---------- releasenotes/notes/consolidate-jjbini-078830f1a3a627c9.yaml | 6 ++++++ shell/jjb-deploy-job.sh | 2 +- 4 files changed, 8 insertions(+), 18 deletions(-) create mode 100644 releasenotes/notes/consolidate-jjbini-078830f1a3a627c9.yaml diff --git a/docs/jjb/lf-ci-jobs.rst b/docs/jjb/lf-ci-jobs.rst index bd477b90..37071d30 100644 --- a/docs/jjb/lf-ci-jobs.rst +++ b/docs/jjb/lf-ci-jobs.rst @@ -64,13 +64,6 @@ lf-infra-jjbini Provides jenkins_jobs.ini configuration for Jenkins. -lf-infra-jjbini-sandbox ------------------------ - -Provides jenkins_jobs.ini configuration for Jenkins sandbox. - -.. todo:: This needs to be consolidated into lf-infra-jjbini when JJB 2.0 is available - lf-packer-common ---------------- diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index a90424c6..4d5dd2e4 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -11,15 +11,6 @@ - file-id: jjbini target: "$HOME/.config/jenkins_jobs/jenkins_jobs.ini" -- builder: - name: lf-infra-jjbini-sandbox - # TODO: Consolidate this into jjbini when JJB2.0 is available. - builders: - - config-file-provider: - files: - - file-id: jjbini-sandbox - target: "$HOME/.config/jenkins_jobs/jenkins_jobs.ini" - - lf_packer: &lf_packer_common name: lf-packer-common # Provide configuration common in packer jobs. @@ -647,7 +638,7 @@ builders: - lf-pip-install: pip-packages: jenkins-job-builder - - lf-infra-jjbini-sandbox + - lf-infra-jjbini - shell: !include-raw-escape: ../shell/jjb-deploy-job.sh publishers: diff --git a/releasenotes/notes/consolidate-jjbini-078830f1a3a627c9.yaml b/releasenotes/notes/consolidate-jjbini-078830f1a3a627c9.yaml new file mode 100644 index 00000000..38b5b9d7 --- /dev/null +++ b/releasenotes/notes/consolidate-jjbini-078830f1a3a627c9.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Consolidated lf-infra-jjbini macros with JJB 2.0. This requires renaming + any Jenkins managed files "jjbini-sandbox" to "jjbini" to switch to the + format supported in JJB > 2.0. diff --git a/shell/jjb-deploy-job.sh b/shell/jjb-deploy-job.sh index 240c1faf..99ef3678 100644 --- a/shell/jjb-deploy-job.sh +++ b/shell/jjb-deploy-job.sh @@ -35,4 +35,4 @@ if [ -z "${JOB_NAME//\*/}" ]; then exit 1 fi -jenkins-jobs update --jobs-only --recursive --workers 4 jjb/ "$JOB_NAME" +jenkins-jobs -s sandbox update --jobs-only --recursive --workers 4 jjb/ "$JOB_NAME" -- 2.16.6