diff --git a/ci-scripts/cleanup-stack-image-ovb.sh b/ci-scripts/cleanup-stack-image-ovb.sh index ed7e34de3..25b7ccef1 100755 --- a/ci-scripts/cleanup-stack-image-ovb.sh +++ b/ci-scripts/cleanup-stack-image-ovb.sh @@ -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 \ # \ # \ -# \ # \ # @@ -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 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 \ diff --git a/ci-scripts/full-deploy-baremetal.sh b/ci-scripts/full-deploy-baremetal.sh index 07c7eb322..8aaa94b06 100644 --- a/ci-scripts/full-deploy-baremetal.sh +++ b/ci-scripts/full-deploy-baremetal.sh @@ -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 \ # \ # \ # \ -# \ # \ # @@ -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 \ diff --git a/ci-scripts/full-deploy-ovb.sh b/ci-scripts/full-deploy-ovb.sh index 0bdd027a7..056f4bb97 100644 --- a/ci-scripts/full-deploy-ovb.sh +++ b/ci-scripts/full-deploy-ovb.sh @@ -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 \ # \ # \ # \ -# \ # \ # \ # \ @@ -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 \ diff --git a/ci-scripts/ovb-image-upload.sh b/ci-scripts/ovb-image-upload.sh index 76dc2c345..a3d84522b 100755 --- a/ci-scripts/ovb-image-upload.sh +++ b/ci-scripts/ovb-image-upload.sh @@ -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 \ # \ # \ # \ -# \ # \ # @@ -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' \