From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Tue, 23 May 2017 14:30:54 +0000 (+0000)
Subject: Merge "Install lftools using the global-jjb scripts"
X-Git-Tag: release/carbon~12
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=dd5eda42d1a7bbda43e091e6ef248286e62a2f12;hp=6e54d42d5a08f4bf66f0203f37acfc841e7e8f85;p=releng%2Fbuilder.git

Merge "Install lftools using the global-jjb scripts"
---

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 0d8528056..288209521 100644
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -113,7 +113,9 @@
 - builder:
     name: autorelease-generate-release-patches
     builders:
-      - shell: !include-raw: include-raw-autorelease-release-versions.sh
+      - shell: !include-raw:
+          - ../global-jjb/shell/lftools-install.sh
+          - include-raw-autorelease-release-versions.sh
 
 - builder:
     name: autorelease-get-integration-test-variables
diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index 0b38f0ee0..e84b8caa2 100644
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -12,19 +12,6 @@
 # RELEASE_TAG=Beryllium-SR1  # Example
 # RELEASE_BRANCH=stable/beryllium  # Example
 
-LFTOOLS_DIR="$WORKSPACE/.venv-lftools"
-if [ ! -d "$LFTOOLS_DIR" ]
-then
-    virtualenv "$LFTOOLS_DIR"
-    # shellcheck disable=SC1090
-    source "$LFTOOLS_DIR/bin/activate"
-    pip install --upgrade pip
-    pip freeze
-    pip install lftools
-fi
-# shellcheck disable=SC1090
-source "$LFTOOLS_DIR/bin/activate"
-
 # Directory to put git format-patches
 PATCH_DIR="$WORKSPACE/patches"
 
diff --git a/jjb/opendaylight-infra-cleanup-old-images.sh b/jjb/opendaylight-infra-cleanup-old-images.sh
index 129ab1336..b3b28e103 100644
--- a/jjb/opendaylight-infra-cleanup-old-images.sh
+++ b/jjb/opendaylight-infra-cleanup-old-images.sh
@@ -1,16 +1,4 @@
 #!/bin/bash
-LFTOOLS_DIR="$WORKSPACE/.venv-lftools"
-if [ ! -d "$LFTOOLS_DIR" ]
-then
-    virtualenv "$LFTOOLS_DIR"
-    # shellcheck disable=SC1090
-    source "$LFTOOLS_DIR/bin/activate"
-    pip install --upgrade pip
-    pip install "lftools>=0.0.10"
-    pip freeze
-fi
-# shellcheck disable=SC1090
-source "$LFTOOLS_DIR/bin/activate"
 
 lftools openstack --os-cloud odlpriv-sandbox \
     image cleanup --hide-public=True \
diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 7fe94b942..e139fc074 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -181,7 +181,9 @@
       - timed: '@weekly'
 
     builders:
-      - shell: !include-raw-escape: opendaylight-infra-cleanup-old-images.sh
+      - shell: !include-raw-escape:
+          - global-jjb/shell/lftools-install.sh
+          - opendaylight-infra-cleanup-old-images.sh
 
     publishers:
       - email-notification: