From: Tim Johnson <tijohnson@linuxfoundation.org>
Date: Mon, 25 Nov 2019 21:35:15 +0000 (-0800)
Subject: Remove use of user venv by builder-jjb-merge job
X-Git-Tag: v0.49.0~21
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=9a198215483631d1e052458ff68f728b2eb1ab20;p=releng%2Fglobal-jjb.git

Remove use of user venv by builder-jjb-merge job

Call lf-activate-venv() to create venv to install jenkins-jobs. Remove
references to jjb-cleanup.sh & jjb-install.sh scripts. Some jobs still
depend on them, so they have to remain for now.

Issue: RELENG-2557
Change-Id: Ib6b8a6e65113a874994a447cb628ca08dc9604c0
Signed-off-by: Tim Johnson <tijohnson@linuxfoundation.org>
---

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 4a746157..3ec2b499 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -734,9 +734,7 @@
       - inject:
           properties-content: JJB_WORKERS={jjb-workers}
       - shell: !include-raw-escape:
-          - ../shell/jjb-install.sh
           - ../shell/jjb-merge-job.sh
-          - ../shell/jjb-cleanup.sh
 
 - job-template:
     name: "{project-name}-jjb-merge"
diff --git a/shell/jjb-merge-job.sh b/shell/jjb-merge-job.sh
index 0a05c4f0..9a497fd0 100644
--- a/shell/jjb-merge-job.sh
+++ b/shell/jjb-merge-job.sh
@@ -15,4 +15,9 @@ workers="${JJB_WORKERS:-0}"
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
 
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+lf-activate-venv jenkins-job-builder
+
 jenkins-jobs update --recursive --delete-old --workers "$workers" jjb/