Add bits to support stable/pike
Add missing bits to support stable/pike branch in TripleO; Some adjustments might be done later but this is a first iteration. Change-Id: I408a6b116b611b67b67f98e1bf7bc533ce22435c
This commit is contained in:
parent
e1d0049b69
commit
6cf056cc68
|
@ -36,15 +36,9 @@ if [ -e ~/stackrc ] ; then
|
|||
openstack workflow list
|
||||
openstack workflow execution list
|
||||
# If there's no overcloud then there's no point in continuing
|
||||
if [[ ! "${STABLE_RELEASE}" =~ ^(newton|ocata) ]]; then
|
||||
openstack stack show --no-resolve-outputs --format yaml overcloud || (echo 'No active overcloud found' && exit 0)
|
||||
openstack stack resource list -n5 --format yaml overcloud
|
||||
openstack stack event list overcloud
|
||||
else
|
||||
heat stack-show overcloud || (echo 'No active overcloud found' && exit 0)
|
||||
heat resource-list -n5 overcloud
|
||||
heat event-list overcloud
|
||||
fi
|
||||
openstack stack show --no-resolve-outputs --format yaml overcloud || (echo 'No active overcloud found' && exit 0)
|
||||
openstack stack resource list -n5 --format yaml overcloud
|
||||
openstack stack event list overcloud
|
||||
# --nested-depth 2 seems to get us a reasonable list of resources without
|
||||
# taking an excessive amount of time
|
||||
openstack stack event list --nested-depth 2 -f json overcloud | $TRIPLEO_ROOT/tripleo-ci/scripts/heat-deploy-times.py | tee /var/log/heat-deploy-times.log || echo 'Failed to process resource deployment times. This is expected for stable/liberty.'
|
||||
|
|
|
@ -34,6 +34,10 @@ file { '/var/www/html/builds-master':
|
|||
ensure => 'link',
|
||||
target => '/var/www/html/builds',
|
||||
}
|
||||
file {"/var/www/html/builds-pike":
|
||||
ensure => "directory",
|
||||
owner => "apache",
|
||||
}
|
||||
file {"/var/www/html/builds-ocata":
|
||||
ensure => "directory",
|
||||
owner => "apache",
|
||||
|
@ -62,6 +66,11 @@ cron {"promote-master":
|
|||
minute => "40"
|
||||
}
|
||||
|
||||
cron {"promote-pike":
|
||||
command => "timeout 10m /opt/stack/tripleo-ci/scripts/mirror-server/promote.sh pike current-tripleo-pike tripleo-dlrn-promote-pike periodic-tripleo-ci-centos-7-ovb-ha-pike-oooq &>/var/log/last_pike_promotion.log",
|
||||
minute => "40"
|
||||
}
|
||||
|
||||
cron {"promote-ocata":
|
||||
command => "timeout 10m /opt/stack/tripleo-ci/scripts/mirror-server/promote.sh ocata current-tripleo-ocata tripleo-dlrn-promote-ocata periodic-tripleo-ci-centos-7-ovb-ha-ocata-oooq &>/var/log/last_ocata_promotion.log",
|
||||
minute => "40"
|
||||
|
|
|
@ -213,8 +213,8 @@ OVB=${OVB:-0}
|
|||
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
||||
export OS_IMAGE_API_VERSION=1
|
||||
fi
|
||||
# Make sure we use Puppet to deploy packages on scenario upgrades jobs from newton to ocata.
|
||||
if [[ "${STABLE_RELEASE}" = "ocata" ]] ; then
|
||||
# Make sure we use Puppet to deploy packages on scenario upgrades jobs after ocata release
|
||||
if [[ "${STABLE_RELEASE}" != "newton" ]] ; then
|
||||
OVERCLOUD_UPGRADE_ARGS="$OVERCLOUD_UPGRADE_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/enable_package_install.yaml "
|
||||
OVERCLOUD_UPGRADE_CONVERGE_ARGS="$OVERCLOUD_UPGRADE_CONVERGE_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/enable_package_install.yaml "
|
||||
fi
|
||||
|
@ -494,7 +494,7 @@ function delorean_build {
|
|||
GITHASH=$(git rev-parse HEAD)
|
||||
|
||||
# Set the branches delorean reads to the same git hash as PROJ has left for us
|
||||
for BRANCH in master origin/master stable/mitaka origin/stable/mitaka stable/newton origin/stable/newton stable/ocata origin/stable/ocata; do
|
||||
for BRANCH in master origin/master stable/mitaka origin/stable/mitaka stable/newton origin/stable/newton stable/ocata origin/stable/ocata stable/pike origin/stable/pike; do
|
||||
git checkout -b $BRANCH || git checkout $BRANCH
|
||||
git reset --hard $GITHASH
|
||||
done
|
||||
|
|
|
@ -241,7 +241,7 @@ else
|
|||
# multinode bootstrap script
|
||||
export DO_BOOTSTRAP_SUBNODES=${DO_BOOTSTRAP_SUBNODES:-1}
|
||||
export BOOTSTRAP_SUBNODES_MINIMAL=0
|
||||
if [[ -z $STABLE_RELEASE || "$STABLE_RELEASE" = "ocata" ]]; then
|
||||
if [[ -z $STABLE_RELEASE || "$STABLE_RELEASE" = "ocata" || "$STABLE_RELEASE" = "pike" ]]; then
|
||||
BOOTSTRAP_SUBNODES_MINIMAL=1
|
||||
fi
|
||||
echo_vars_to_deploy_env_oooq
|
||||
|
|
|
@ -120,7 +120,9 @@ if [[ $TOCI_JOBTYPE =~ upgrades ]]; then
|
|||
# We deploy a master Undercloud and an Overcloud with the
|
||||
# previous release. The pingtest is disable because it won't
|
||||
# work with the few services deployed.
|
||||
if [ "$STABLE_RELEASE" = "ocata" ]; then
|
||||
if [ "$STABLE_RELEASE" = "pike" ]; then
|
||||
UPGRADE_RELEASE=ocata
|
||||
elif [ "$STABLE_RELEASE" = "ocata" ]; then
|
||||
UPGRADE_RELEASE=newton
|
||||
elif [ -z $STABLE_RELEASE ]; then
|
||||
UPGRADE_RELEASE=ocata
|
||||
|
@ -208,7 +210,9 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
|||
if [ $TOCI_JOBTYPE == 'undercloud-upgrades' ] ; then
|
||||
# We want to start by installing an Undercloud
|
||||
# from the previous stable release.
|
||||
if [ "$STABLE_RELEASE" = "ocata" ]; then
|
||||
if [ "$STABLE_RELEASE" = "pike" ]; then
|
||||
STABLE_RELEASE=ocata
|
||||
elif [ "$STABLE_RELEASE" = "ocata" ]; then
|
||||
STABLE_RELEASE=newton
|
||||
elif [ "$STABLE_RELEASE" = "newton" ]; then
|
||||
STABLE_RELEASE=mitaka
|
||||
|
|
Loading…
Reference in New Issue