Remove deprecated lftools-install.sh

lftools-install.sh has been deprecated since v0.25.0 it's about time
we remove it from global-jjb officially.

Change-Id: I770eec99ae63cf92aa145124859f09d5d327c451
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/.jjb-test/defaults.yaml b/.jjb-test/defaults.yaml
index 4a7a3bb..6692a0a 100644 (file)
--- a/.jjb-test/defaults.yaml
+++ b/.jjb-test/defaults.yaml
@@ -19,7 +19,6 @@
     github_pr_admin_list:
       - tykeal
 
-    lftools-version: '<1.0.0'
     mvn-site-id: project-site
     mvn-staging-id: project-staging
 

diff --git a/jjb/lf-c-cpp-jobs.yaml b/jjb/lf-c-cpp-jobs.yaml
index c40af55..07e5ec4 100644 (file)
--- a/jjb/lf-c-cpp-jobs.yaml
+++ b/jjb/lf-c-cpp-jobs.yaml
@@ -45,7 +45,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - lf-cmake-parameters:
           build-dir: '{build-dir}'
           cmake-opts: '{cmake-opts}'
@@ -90,7 +89,7 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     builders:
-      - shell: !include-raw-escape: ../shell/lftools-install.sh
+      - lf-infra-pre-build
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
@@ -228,7 +227,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - lf-cmake-parameters:
           build-dir: '{build-dir}'
           cmake-opts: '{cmake-opts}'

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index f097260..85a44f8 100644 (file)
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -58,7 +58,6 @@
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - lf-packer-parameters:
           packer-version: '{packer-version}'
 
@@ -139,7 +138,6 @@
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - lf-infra-jjb-parameters:
           jjb-cache: '{jjb-cache}'
           jjb-version: '{jjb-version}'
@@ -191,7 +189,6 @@
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
 
     wrappers:
       - lf-infra-wrappers:
@@ -295,7 +292,6 @@
           project: '{project}'
           stream: ''
           branch: master
-          lftools-version: '{lftools-version}'
 
     wrappers:
       - lf-infra-wrappers:
@@ -436,7 +432,6 @@
           project: '{project}'
           stream: ''
           branch: master
-          lftools-version: '{lftools-version}'
 
     wrappers:
       - lf-infra-wrappers:
@@ -616,7 +611,6 @@
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
 
     wrappers:
       - lf-infra-wrappers:
@@ -1042,7 +1036,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
 
     wrappers:
       - lf-infra-wrappers:
@@ -1273,7 +1266,6 @@
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - string:
           name: JENKINS_URLS
           default: '{jenkins-urls}'
@@ -1389,7 +1381,6 @@
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - lf-packer-parameters:
           packer-version: '{packer-version}'
 

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 04d5e37..01cf059 100644 (file)
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -171,7 +171,6 @@
               GROUP_ID={group-id}
               UPLOAD_FILES_PATH={upload-files-dir}
       - shell: !include-raw-escape:
-          - ../shell/lftools-install.sh
           - ../shell/common-variables.sh
           - ../shell/deploy-maven-file.sh
       - lf-provide-maven-settings-cleanup
@@ -405,15 +404,6 @@
 
               If using GitHub, in a manual build override with a branch path or
               sha1 hash to a specific commit. For example: 'origin/master'
-      # Tools
-      - string:
-          name: LFTOOLS_VERSION
-          default: '{lftools-version}'
-          description: |
-              Version of lftools to install. Can be a specific version like
-              '0.6.0' or a PEP-440 definition.
-              https://www.python.org/dev/peps/pep-0440/
-              For example '<1.0.0' or '>=1.0.0,<2.0.0'.
 
 - parameter:
     name: lf-infra-node-parameters

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index dd67b60..eb2c701 100644 (file)
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -76,7 +76,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - lf-infra-maven-parameters:
           mvn-opts: '{mvn-opts}'
           mvn-params: '{mvn-params}'
@@ -142,7 +141,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - lf-infra-maven-parameters:
           mvn-opts: '{mvn-opts}'
           mvn-params: '{mvn-params}'
@@ -694,7 +692,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - lf-infra-maven-parameters:
           mvn-opts: '{mvn-opts}'
           mvn-params: '{mvn-params}'
@@ -845,7 +842,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - lf-infra-maven-parameters:
           mvn-opts: '{mvn-opts}'
           mvn-params: '{mvn-params}'

diff --git a/jjb/lf-node-jobs.yaml b/jjb/lf-node-jobs.yaml
index 36475e5..21f0fb5 100644 (file)
--- a/jjb/lf-node-jobs.yaml
+++ b/jjb/lf-node-jobs.yaml
@@ -48,7 +48,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - lf-infra-node-parameters:
           node-dir: '{node-dir}'
           node-version: '{node-version}'

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index 78976d9..dfd4d34 100644 (file)
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -49,7 +49,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
 
     wrappers:
       - lf-infra-wrappers:
@@ -102,7 +101,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - string:
           name: NEXUS_IQ_CLI_VERSION
           default: '{nexus-iq-cli-version}'
@@ -251,7 +249,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -435,7 +432,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - lf-infra-tox-parameters:
           tox-dir: '{tox-dir}'
           tox-envs: '{tox-envs}'

diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml
index 7101ae8..d1333d3 100644 (file)
--- a/jjb/lf-rtd-jobs.yaml
+++ b/jjb/lf-rtd-jobs.yaml
@@ -45,7 +45,6 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
 
     wrappers:
       - lf-infra-wrappers:

diff --git a/shell/lftools-install.sh b/shell/lftools-install.sh
deleted file mode 100644 (file)
index e0eda06..0000000
--- a/shell/lftools-install.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2017 The Linux Foundation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-##############################################################################
-echo "---> lftools-install.sh"
-echo 'WARNING: The lftools-install.sh script is deprecated. We now recommend \
-to use `pip install --user lftools` to install.'
-
-# Script to install lftools via a version passed in via lf-infra-parameters
-#
-# Required parameters:
-#
-#     LFTOOLS_VERSION: Passed in via lf-infra-parameters configuration. Can be
-#                      set to a strict version number like '1.2.3' or using
-#                      PEP-440 definitions.
-#
-#                      Examples:
-#                          <1.0.0
-#                          >=1.0.0,<2.0.0
-#
-# By default a released version of lftools should always be used.
-# The purpose of the 2 variables below is so that lftools devs can test
-# unreleased versions of lftools. There are 2 methods to install a dev version
-# of lftools:
-#
-#     1) gerrit patch: Used to test a patch that has not yet been merged.
-#                      To do this set something like this:
-#                          LFTOOLS_MODE=gerrit
-#                          LFTOOLS_REFSPEC=refs/changes/96/5296/7
-#
-#     2) git branch: Used to install an lftools version from a specific branch.
-#                    To use this set the variables as follows:
-#                          LFTOOLS_MODE=git
-#                          LFTOOLS_REFSPEC=master
-#
-#     3) release : The intended use case and default setting.
-#                  Set LFTOOLS_MODE=release, in this case LFTOOLS_REFSPEC is unused.
-
-LFTOOLS_MODE=release  # release | git | gerrit
-LFTOOLS_REFSPEC=master
-
-# Ensure we fail the job if any steps fail.
-# DO NOT set -u as virtualenv's activate script has unbound variables
-set -e -o pipefail
-
-virtualenv --quiet "/tmp/v/lftools"
-# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
-source "/tmp/v/lftools/bin/activate"
-pip install --quiet --upgrade "pip==9.0.3" setuptools
-
-case $LFTOOLS_MODE in
-    gerrit)
-        git clone https://gerrit.linuxfoundation.org/infra/releng/lftools.git /tmp/lftools
-        pushd /tmp/lftools
-        git fetch origin "$LFTOOLS_REFSPEC"
-        git checkout FETCH_HEAD
-        pip install --quiet --upgrade -r requirements.txt
-        pip install --quiet --upgrade -e .
-        popd
-        ;;
-
-    git)
-        pip install --quiet --upgrade git+https://gerrit.linuxfoundation.org/infra/releng/lftools.git@"$BRANCH"
-        ;;
-
-    release)
-        if [[ $LFTOOLS_VERSION =~ ^[0-9] ]]; then
-            LFTOOLS_VERSION="==$LFTOOLS_VERSION"
-        fi
-
-        pip install --quiet --upgrade "lftools${LFTOOLS_VERSION}"
-        ;;
-esac
-
-lftools --version
-
-# pipdeptree prints out a lot of information because lftools pulls in many
-# dependencies. Let's only print it if we want to debug.
-# echo "----> Pip Dependency Tree"
-# pip install --quiet --upgrade pipdeptree
-# pipdeptree