Merge "Refactor the common-view and csit-view template"

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index da70ba3..733def5 100644 (file)
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -1280,9 +1280,9 @@
       - timed: '{obj:cron}'
 
     builders:
+      - lf-infra-pre-build
       - inject:
           properties-content: OS_CLOUD={openstack-cloud}
-      - shell: !include-raw-escape: ../shell/openstack-install.sh
       - shell: !include-raw-escape: ../shell/openstack-protect-in-use-images.sh
 
     publishers:

diff --git a/releasenotes/notes/lftools-openstack-0d08d09a1e598062.yaml b/releasenotes/notes/lftools-openstack-0d08d09a1e598062.yaml
new file mode 100644 (file)
index 0000000..1bd7525
--- /dev/null
+++ b/releasenotes/notes/lftools-openstack-0d08d09a1e598062.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - |
+    lftools' ``openstack`` module will now be installed as part of
+    pre-build.

diff --git a/shell/openstack-install.sh b/shell/openstack-install.sh
deleted file mode 100644 (file)
index a7e5099..0000000
--- a/shell/openstack-install.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2018 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
-##############################################################################
-# Install the openstack cli
-echo "---> Install openstack cli"
-
-set -eux -o pipefail
-
-pip install --user --quiet --upgrade "pip<10.0.0" setuptools
-pip install --user --quiet --upgrade python-openstackclient python-heatclient
-pip freeze

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index 254fa77..4506062 100644 (file)
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -14,7 +14,7 @@ set -eux -o pipefail
 REQUIREMENTS_FILE=$(mktemp /tmp/requirements-XXXX.txt)
 
 cat << EOF > "$REQUIREMENTS_FILE"
-lftools~=0.18.0
+lftools[openstack]~=0.18.0
 python-heatclient~=1.16.1
 python-openstackclient~=3.16.0
 EOF