Remove references to Liberty (now EOL'd)
Change-Id: I57d977e48bac4cf703d9c428a0f527baa1968d99
This commit is contained in:
parent
cd4d0d4a58
commit
08af9ed794
|
@ -48,7 +48,7 @@ export ELEMENTS_PATH="${COMMON_ELEMENTS_PATH}:/usr/share/instack-undercloud:/usr
|
||||||
|
|
||||||
sudo yum -y install openstack-tripleo-common
|
sudo yum -y install openstack-tripleo-common
|
||||||
|
|
||||||
if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
|
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
||||||
ELEMENTS=$(\
|
ELEMENTS=$(\
|
||||||
tripleo-build-images \
|
tripleo-build-images \
|
||||||
--image-json-output \
|
--image-json-output \
|
||||||
|
@ -86,7 +86,7 @@ sudo -E instack \
|
||||||
-x delorean-repo \
|
-x delorean-repo \
|
||||||
-d
|
-d
|
||||||
|
|
||||||
if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
|
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
||||||
PACKAGES=$(\
|
PACKAGES=$(\
|
||||||
tripleo-build-images \
|
tripleo-build-images \
|
||||||
--image-json-output \
|
--image-json-output \
|
||||||
|
|
|
@ -106,10 +106,6 @@ lock_path=/tmp
|
||||||
# Added in kilo
|
# Added in kilo
|
||||||
bootable=true
|
bootable=true
|
||||||
|
|
||||||
# It needs to be true since mitaka
|
|
||||||
# this option expected to be removed after liberty EOL
|
|
||||||
volume_services=true
|
|
||||||
|
|
||||||
[compute-feature-enabled]
|
[compute-feature-enabled]
|
||||||
# Default deployment does not use shared storage
|
# Default deployment does not use shared storage
|
||||||
live_migration=false
|
live_migration=false
|
||||||
|
|
|
@ -124,7 +124,7 @@ OVERCLOUD_DELETE=${OVERCLOUD_DELETE:-""}
|
||||||
OVERCLOUD_DELETE_TIMEOUT=${OVERCLOUD_DELETE_TIMEOUT:-"300"}
|
OVERCLOUD_DELETE_TIMEOUT=${OVERCLOUD_DELETE_TIMEOUT:-"300"}
|
||||||
OVERCLOUD_DEPLOY_ARGS=${OVERCLOUD_DEPLOY_ARGS:-""}
|
OVERCLOUD_DEPLOY_ARGS=${OVERCLOUD_DEPLOY_ARGS:-""}
|
||||||
# --validation-errors-fatal was deprecated in newton and removed in ocata
|
# --validation-errors-fatal was deprecated in newton and removed in ocata
|
||||||
if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]]; then
|
if [[ "${STABLE_RELEASE}" = "mitaka" ]]; then
|
||||||
OVERCLOUD_VALIDATE_ARGS=${OVERCLOUD_VALIDATE_ARGS-"--validation-errors-fatal --validation-warnings-fatal"}
|
OVERCLOUD_VALIDATE_ARGS=${OVERCLOUD_VALIDATE_ARGS-"--validation-errors-fatal --validation-warnings-fatal"}
|
||||||
else
|
else
|
||||||
OVERCLOUD_VALIDATE_ARGS=${OVERCLOUD_VALIDATE_ARGS-"--validation-warnings-fatal"}
|
OVERCLOUD_VALIDATE_ARGS=${OVERCLOUD_VALIDATE_ARGS-"--validation-warnings-fatal"}
|
||||||
|
@ -160,8 +160,8 @@ OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF=${OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF:-"\
|
||||||
$REPO_PREFIX/delorean.repo \
|
$REPO_PREFIX/delorean.repo \
|
||||||
$REPO_PREFIX/delorean-current.repo \
|
$REPO_PREFIX/delorean-current.repo \
|
||||||
$REPO_PREFIX/delorean-deps.repo"}
|
$REPO_PREFIX/delorean-deps.repo"}
|
||||||
# Use Ceph/Jewel for all but liberty/mitaka
|
# Use Ceph/Jewel for all but mitaka
|
||||||
if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
|
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
||||||
OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF=${OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF}"\
|
OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF=${OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF}"\
|
||||||
$REPO_PREFIX/CentOS-Ceph-Hammer.repo"
|
$REPO_PREFIX/CentOS-Ceph-Hammer.repo"
|
||||||
else
|
else
|
||||||
|
@ -196,7 +196,7 @@ export SCRIPTS_DIR=$(dirname ${BASH_SOURCE[0]:-$0})
|
||||||
OPSTOOLS_REPO_ENABLED=${OPSTOOLS_REPO_ENABLED:-"0"}
|
OPSTOOLS_REPO_ENABLED=${OPSTOOLS_REPO_ENABLED:-"0"}
|
||||||
OPSTOOLS_REPO_URL=${OPSTOOLS_REPO_URL:-"https://raw.githubusercontent.com/centos-opstools/opstools-repo/master/opstools.repo"}
|
OPSTOOLS_REPO_URL=${OPSTOOLS_REPO_URL:-"https://raw.githubusercontent.com/centos-opstools/opstools-repo/master/opstools.repo"}
|
||||||
|
|
||||||
if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
|
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
||||||
export OS_IMAGE_API_VERSION=1
|
export OS_IMAGE_API_VERSION=1
|
||||||
fi
|
fi
|
||||||
# Temporary workarounds
|
# Temporary workarounds
|
||||||
|
@ -268,7 +268,7 @@ function repo_setup {
|
||||||
|
|
||||||
if [ "$TRIPLEO_OS_DISTRO" = "centos" ]; then
|
if [ "$TRIPLEO_OS_DISTRO" = "centos" ]; then
|
||||||
# Enable Storage/SIG Ceph repo
|
# Enable Storage/SIG Ceph repo
|
||||||
if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
|
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
||||||
CEPH_REPO_RPM=centos-release-ceph-hammer
|
CEPH_REPO_RPM=centos-release-ceph-hammer
|
||||||
CEPH_REPO_FILE=CentOS-Ceph-Hammer.repo
|
CEPH_REPO_FILE=CentOS-Ceph-Hammer.repo
|
||||||
else
|
else
|
||||||
|
@ -451,7 +451,7 @@ function delorean_build {
|
||||||
GITHASH=$(git rev-parse HEAD)
|
GITHASH=$(git rev-parse HEAD)
|
||||||
|
|
||||||
# Set the branches delorean reads to the same git hash as PROJ has left for us
|
# Set the branches delorean reads to the same git hash as PROJ has left for us
|
||||||
for BRANCH in master origin/master stable/liberty origin/stable/liberty stable/mitaka origin/stable/mitaka; do
|
for BRANCH in master origin/master stable/mitaka origin/stable/mitaka; do
|
||||||
git checkout -b $BRANCH || git checkout $BRANCH
|
git checkout -b $BRANCH || git checkout $BRANCH
|
||||||
git reset --hard $GITHASH
|
git reset --hard $GITHASH
|
||||||
done
|
done
|
||||||
|
@ -546,7 +546,7 @@ except:
|
||||||
log "Overcloud images saved in $OVERCLOUD_IMAGES_PATH"
|
log "Overcloud images saved in $OVERCLOUD_IMAGES_PATH"
|
||||||
pushd $OVERCLOUD_IMAGES_PATH
|
pushd $OVERCLOUD_IMAGES_PATH
|
||||||
log "OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF=$OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF"
|
log "OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF=$OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF"
|
||||||
if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka|newton)$ ]] ; then
|
if [[ "${STABLE_RELEASE}" =~ ^(mitaka|newton)$ ]] ; then
|
||||||
OVERCLOUD_IMAGES_ARGS="$OVERCLOUD_IMAGES_LEGACY_ARGS"
|
OVERCLOUD_IMAGES_ARGS="$OVERCLOUD_IMAGES_LEGACY_ARGS"
|
||||||
fi
|
fi
|
||||||
DIB_YUM_REPO_CONF=$OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF \
|
DIB_YUM_REPO_CONF=$OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF \
|
||||||
|
@ -573,7 +573,7 @@ function register_nodes {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
stackrc_check
|
stackrc_check
|
||||||
if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
|
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
||||||
openstack baremetal import --json $INSTACKENV_JSON_PATH
|
openstack baremetal import --json $INSTACKENV_JSON_PATH
|
||||||
# This step is a part of the import command from Newton on
|
# This step is a part of the import command from Newton on
|
||||||
openstack baremetal configure boot
|
openstack baremetal configure boot
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# This is for liberty and Mitaka. In newton and beyond we have a separate file
|
# This is for Mitaka. In newton and beyond we have a separate file for
|
||||||
# for the endpoints so we won't need to maintain this in two repos.
|
# the endpoints so we won't need to maintain this in two repos.
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
EndpointMap:
|
EndpointMap:
|
||||||
AodhAdmin: {protocol: 'http', port: '8042', host: 'IP_ADDRESS'}
|
AodhAdmin: {protocol: 'http', port: '8042', host: 'IP_ADDRESS'}
|
||||||
|
|
|
@ -191,7 +191,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
||||||
PACEMAKER=1
|
PACEMAKER=1
|
||||||
;;
|
;;
|
||||||
nonha)
|
nonha)
|
||||||
if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
|
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
||||||
ENDPOINT_LIST_LOCATION=$TRIPLEO_ROOT/tripleo-ci/test-environments
|
ENDPOINT_LIST_LOCATION=$TRIPLEO_ROOT/tripleo-ci/test-environments
|
||||||
CA_ENVIRONMENT_FILE=inject-trust-anchor.yaml
|
CA_ENVIRONMENT_FILE=inject-trust-anchor.yaml
|
||||||
else
|
else
|
||||||
|
@ -268,7 +268,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
||||||
CACHEUPLOAD=1
|
CACHEUPLOAD=1
|
||||||
OVERCLOUD_PINGTEST_ARGS=
|
OVERCLOUD_PINGTEST_ARGS=
|
||||||
;;
|
;;
|
||||||
liberty|mitaka)
|
mitaka)
|
||||||
# This is handled in tripleo.sh (it always uses centos7-$STABLE_RELEASE/current)
|
# This is handled in tripleo.sh (it always uses centos7-$STABLE_RELEASE/current)
|
||||||
# where $STABLE_RELEASE is derived in toci_instack.sh
|
# where $STABLE_RELEASE is derived in toci_instack.sh
|
||||||
unset DELOREAN_REPO_URL
|
unset DELOREAN_REPO_URL
|
||||||
|
@ -306,7 +306,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
||||||
done
|
done
|
||||||
|
|
||||||
# Limit worker counts to avoid overloading our limited resources
|
# Limit worker counts to avoid overloading our limited resources
|
||||||
if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
|
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
||||||
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config-mitaka-and-below.yaml"
|
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config-mitaka-and-below.yaml"
|
||||||
else
|
else
|
||||||
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml"
|
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml"
|
||||||
|
|
|
@ -45,7 +45,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# TODO(sshnaidm): to move these variables to jobs yaml config files (see above)
|
# TODO(sshnaidm): to move these variables to jobs yaml config files (see above)
|
||||||
if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
|
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
||||||
export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config-mitaka-and-below.yaml"
|
export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config-mitaka-and-below.yaml"
|
||||||
else
|
else
|
||||||
export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml"
|
export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml"
|
||||||
|
|
Loading…
Reference in New Issue