From: Anil Belur <abelur@linuxfoundation.org>
Date: Thu, 16 Jul 2020 23:31:33 +0000 (+1000)
Subject: Fix jjb-deploy job to accept JJB_VERSION parameter
X-Git-Tag: v0.55.2~2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=3e70f4820674435ee760acb40d5bf872edab6802;p=releng%2Fglobal-jjb.git

Fix jjb-deploy job to accept JJB_VERSION parameter

Fix the jjb-deploy job to accept a JJB_VERSION parameter in the
build parameters field so that projects can select which version
of JJB they want for the job.

Issue: RELENG-3073
Change-Id: I33653d50e11c79a00a5858c395bc05f20a03d283
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Signed-off-by: Thanh Ha <zxiiro@gmail.com>
---

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 1ccb06b7..a48f3251 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -623,6 +623,9 @@
           project: "{project}"
           stream: "{stream}"
           branch: "{branch}"
+      - lf-infra-jjb-parameters:
+          jjb-cache: "{jjb-cache}"
+          jjb-version: "{jjb-version}"
 
     wrappers:
       - lf-infra-wrappers:
@@ -639,6 +642,8 @@
 - job-template:
     name: "{project-name}-jjb-deploy-job"
     id: gerrit-jjb-deploy-job
+    <<: *lf_jjb_common
+    # yamllint disable-line rule:key-duplicates
     <<: *lf_jjb_deploy_job
 
     scm:
@@ -671,6 +676,8 @@
 - job-template:
     name: "{project-name}-jjb-deploy-job"
     id: github-jjb-deploy-job
+    <<: *lf_jjb_common
+    # yamllint disable-line rule:key-duplicates
     <<: *lf_jjb_deploy_job
 
     properties:
diff --git a/releasenotes/notes/include-jjb-version-param-deploy-jjb-b2c2f915274405f2.yaml b/releasenotes/notes/include-jjb-version-param-deploy-jjb-b2c2f915274405f2.yaml
new file mode 100644
index 00000000..de143651
--- /dev/null
+++ b/releasenotes/notes/include-jjb-version-param-deploy-jjb-b2c2f915274405f2.yaml
@@ -0,0 +1,17 @@
+---
+fixes:
+  - |
+    Fix the jjb-deploy job to accept a JJB_VERSION parameter in the parameters
+    field so that projects can select which version of JJB they want for the job.
+
+    The change that ended up breaking jjb-deploy was caused by this Gerrit
+    patch here:
+
+    https://gerrit.linuxfoundation.org/infra/c/releng/global-jjb/+/62788
+
+    The bug was introduced in the lf-env.sh when the lf-pip-install macro was
+    removed. Prior to the removal the jjb-deploy job was installing the latest
+    and greatest JJB version. However now jjb-deploy is now installing the
+    fallback version of JJB_VERSION from the lf-env.sh script which is 2.8.0.
+
+    Reference: `RELENG-3073 <https://jira.linuxfoundation.org/browse/RELENG-3073>`_