From 7a5d4641fd29ff65e870ce0f8dfd686f943ef603 Mon Sep 17 00:00:00 2001
From: Tim Johnson <tijohnson@linuxfoundation.org>
Date: Fri, 15 Nov 2019 16:23:02 -0800
Subject: [PATCH] Remove use of user venv by build-jjb-verify job

Call lf-activate-venv() to create required venv. Not longer need
jjb-cleanup.sh & jjb-install.sh. Some project repos still depend on
them, so they have to remain for now.

Issue: RELENG-2538
Change-Id: I22f122d81a7f4977cb0be1e52f5c0317390f23cd
Signed-off-by: Tim Johnson <tijohnson@linuxfoundation.org>
---
 jjb/lf-ci-jobs.yaml                                            | 8 --------
 releasenotes/notes/stop-using-user-venvs-cb6ba37b76f5bc4a.yaml | 4 ++++
 shell/jjb-verify-job.sh                                        | 8 ++++++++
 3 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/stop-using-user-venvs-cb6ba37b76f5bc4a.yaml

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 9f12231f..4a746157 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -849,11 +849,7 @@
       - lf-infra-pre-build
       - lf-infra-jjbini
       - shell: !include-raw-escape:
-          - ../shell/git-validate-jira-urls.sh
-          - ../shell/jjb-install.sh
           - ../shell/jjb-verify-job.sh
-          - ../shell/jjb-check-unicode.sh
-          - ../shell/jjb-cleanup.sh
       - lf-infra-gpg-verify-git-signature
 
 - job-template:
@@ -956,11 +952,7 @@
           git cherry-pick FETCH_HEAD
       - lf-infra-jjbini
       - shell: !include-raw-escape:
-          - ../shell/git-validate-jira-urls.sh
-          - ../shell/jjb-install.sh
           - ../shell/jjb-verify-job.sh
-          - ../shell/jjb-check-unicode.sh
-          - ../shell/jjb-cleanup.sh
       - lf-infra-gpg-verify-git-signature
 
 - job-template:
diff --git a/releasenotes/notes/stop-using-user-venvs-cb6ba37b76f5bc4a.yaml b/releasenotes/notes/stop-using-user-venvs-cb6ba37b76f5bc4a.yaml
new file mode 100644
index 00000000..a78e1f3c
--- /dev/null
+++ b/releasenotes/notes/stop-using-user-venvs-cb6ba37b76f5bc4a.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - Removed dependency on 'user' venv created by python-tools-install.sh from
+    the builder-jjb-verify job. It will call lf-acitivate-venv() instead.
diff --git a/shell/jjb-verify-job.sh b/shell/jjb-verify-job.sh
index 8dd50f7f..d7a9e313 100644
--- a/shell/jjb-verify-job.sh
+++ b/shell/jjb-verify-job.sh
@@ -13,6 +13,14 @@ echo "---> jjb-verify-job.sh"
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
 
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+lf-git-validate-jira-urls
+lf-jjb-check-ascii
+
+lf-activate-venv jenkins-job-builder
+
 jenkins-jobs -l DEBUG test --recursive -o archives/job-configs --config-xml jjb/
 
 # Sort job output into sub-directories. On large Jenkins systems that have
-- 
2.16.6