Remove external requirements

Third party repos are included in the extras requirements
file in tripleo-quickstart.

Change-Id: I0d3bef6b24d458d591730ca27d29f30e80cb726f
This commit is contained in:
Ronelle Landy 2016-09-14 12:12:08 -04:00
parent 4477d9ed1f
commit 616eda6b94
4 changed files with 10 additions and 26 deletions

View File

@ -1,11 +1,9 @@
#!/bin/bash
# CI test that cleans up a deploy and image on Openstack Virtual Baremetal.
# $HW_ENV_DIR is the directory where environment-specific files are kept.
# $REQUIREMENTS_FILE is used to include any additional repositories
# Usage: cleanup-stack-image-ovb.sh \
# <hw-env-dir> \
# <network-isolation> \
# <requirements-file> \
# <ovb-creds-file> \
# <playbook>
@ -13,9 +11,8 @@ set -eux
HW_ENV_DIR=$1
NETWORK_ISOLATION=$2
REQUIREMENTS_FILE=$3
OVB_CREDS_FILE=$4
PLAYBOOK=$5
OVB_CREDS_FILE=$3
PLAYBOOK=$4
# env file is named <prefix>env.yaml
# prefix is built from:
@ -35,7 +32,6 @@ bash quickstart.sh \
--bootstrap \
--working-dir $WORKSPACE/ \
--requirements quickstart-extras-requirements.txt \
--requirements $WORKSPACE/$HW_ENV_DIR/network_configs/$NETWORK_ISOLATION/requirements_files/$REQUIREMENTS_FILE \
--release $RELEASE \
--extra-vars prefix=$PREFIX \
--extra-vars @$OVB_CREDS_FILE \

View File

@ -1,12 +1,10 @@
#!/bin/bash
# CI test that does a full deploy on baremetal hardware.
# $HW_ENV_DIR is the directory where environment-specific files are kept.
# $REQUIREMENTS_FILE is used to include any additional repositories
# Usage: full-deploy-baremetal.sh \
# <release> \
# <hw-env-dir> \
# <network-isolation> \
# <requirements-file> \
# <config-file> \
# <playbook>
@ -15,9 +13,8 @@ set -eux
RELEASE=$1
HW_ENV_DIR=$2
NETWORK_ISOLATION=$3
REQUIREMENTS_FILE=$4
CONFIG_FILE=$5
PLAYBOOK=$6
CONFIG_FILE=$4
PLAYBOOK=$5
socketdir=$(mktemp -d /tmp/sockXXXXXX)
export ANSIBLE_SSH_CONTROL_PATH=$socketdir/%%h-%%r
@ -30,7 +27,6 @@ bash quickstart.sh \
--no-clone \
--teardown all \
--requirements quickstart-extras-requirements.txt \
--requirements $WORKSPACE/$HW_ENV_DIR/network_configs/$NETWORK_ISOLATION/requirements_files/$REQUIREMENTS_FILE \
--config $WORKSPACE/$HW_ENV_DIR/network_configs/$NETWORK_ISOLATION/config_files/$CONFIG_FILE \
--extra-vars @$WORKSPACE/$HW_ENV_DIR/network_configs/$NETWORK_ISOLATION/env_settings.yml \
--playbook $PLAYBOOK \

View File

@ -1,12 +1,10 @@
#!/bin/bash
# CI test that does a full deploy on Openstack Virtual Baremetal.
# $HW_ENV_DIR is the directory where environment-specific files are kept.
# $REQUIREMENTS_FILE is used to include any additional repositories
# Usage: full-deploy-ovb.sh \
# <release> \
# <hw-env-dir> \
# <network-isolation> \
# <requirements-file> \
# <config-file> \
# <ovb-settings-file> \
# <ovb-creds-file> \
@ -17,11 +15,10 @@ set -eux
RELEASE=$1
HW_ENV_DIR=$2
NETWORK_ISOLATION=$3
REQUIREMENTS_FILE=$4
CONFIG_FILE=$5
OVB_SETTINGS_FILE=$6
OVB_CREDS_FILE=$7
PLAYBOOK=$8
CONFIG_FILE=$4
OVB_SETTINGS_FILE=$5
OVB_CREDS_FILE=$6
PLAYBOOK=$7
socketdir=$(mktemp -d /tmp/sockXXXXXX)
export ANSIBLE_SSH_CONTROL_PATH=$socketdir/%%h-%%r
@ -33,7 +30,6 @@ bash quickstart.sh \
--tags all \
--no-clone \
--requirements quickstart-extras-requirements.txt \
--requirements $WORKSPACE/$HW_ENV_DIR/network_configs/$NETWORK_ISOLATION/requirements_files/$REQUIREMENTS_FILE \
--config $WORKSPACE/$HW_ENV_DIR/network_configs/$NETWORK_ISOLATION/config_files/$CONFIG_FILE \
--extra-vars @$OVB_SETTINGS_FILE \
--extra-vars @$OVB_CREDS_FILE \

View File

@ -1,12 +1,10 @@
#!/bin/bash
# CI script to upload an undercloud image to Openstack Virtual Baremetal.
# $HW_ENV_DIR is the directory where environment-specific files are kept.
# $REQUIREMENTS_FILE is used to include any additional repositories
# Usage: ovb-image-upload.sh \
# <release> \
# <hw-env-dir> \
# <network-isolation> \
# <requirements-file> \
# <ovb-creds-file> \
# <playbook>
@ -15,9 +13,8 @@ set -eux
RELEASE=$1
HW_ENV_DIR=$2
NETWORK_ISOLATION=$3
REQUIREMENTS_FILE=$4
OVB_CREDS_FILE=$5
PLAYBOOK=$6
OVB_CREDS_FILE=$4
PLAYBOOK=$5
pushd $WORKSPACE/tripleo-quickstart
@ -26,7 +23,6 @@ bash quickstart.sh \
--bootstrap \
--working-dir $WORKSPACE/ \
--requirements quickstart-extras-requirements.txt \
--requirements $WORKSPACE/$HW_ENV_DIR/network_configs/$NETWORK_ISOLATION/requirements_files/$REQUIREMENTS_FILE \
--release $RELEASE \
--extra-vars @$OVB_CREDS_FILE \
--extra-vars get_latest_image='upload' \