Add support for distro and major release delineation
We'll need unique release files for CentOS-7, CentOS-8, Fedora-28 and RHEL Change-Id: I5613d1acb2925a1066623665f0598a060c97acee Partial-Bug: #1740928 Story: https://tree.taiga.io/project/tripleo-ci-board/us/1
This commit is contained in:
parent
8f6ef6e053
commit
58bb094700
|
@ -30,6 +30,8 @@
|
||||||
set -e
|
set -e
|
||||||
set -x
|
set -x
|
||||||
export TOCI_JOBTYPE={{ toci_jobtype }}
|
export TOCI_JOBTYPE={{ toci_jobtype }}
|
||||||
|
export DISTRIBUTION={{ ansible_distribution }}
|
||||||
|
export DISTRIBUTION_MAJOR_VERSION={{ ansible_distribution_major_version }}
|
||||||
|
|
||||||
# ZUUL does not set these for periodic jobs
|
# ZUUL does not set these for periodic jobs
|
||||||
export ZUUL_BRANCH=${ZUUL_BRANCH:-master}
|
export ZUUL_BRANCH=${ZUUL_BRANCH:-master}
|
||||||
|
|
|
@ -46,7 +46,7 @@ QUICKSTART_INSTALL_CMD="
|
||||||
QUICKSTART_COLLECTLOGS_CMD="$LOCAL_WORKING_DIR/bin/ansible-playbook \
|
QUICKSTART_COLLECTLOGS_CMD="$LOCAL_WORKING_DIR/bin/ansible-playbook \
|
||||||
$LOCAL_WORKING_DIR/playbooks/collect-logs.yml \
|
$LOCAL_WORKING_DIR/playbooks/collect-logs.yml \
|
||||||
-vv \
|
-vv \
|
||||||
--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/$QUICKSTART_RELEASE.yml \
|
--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}/$QUICKSTART_RELEASE.yml \
|
||||||
{{ featureset_conf }} \
|
{{ featureset_conf }} \
|
||||||
{{ env_vars }} \
|
{{ env_vars }} \
|
||||||
{{ extra_vars }} \
|
{{ extra_vars }} \
|
||||||
|
@ -56,7 +56,7 @@ QUICKSTART_COLLECTLOGS_CMD="$LOCAL_WORKING_DIR/bin/ansible-playbook \
|
||||||
--tags all \
|
--tags all \
|
||||||
"
|
"
|
||||||
|
|
||||||
export QUICKSTART_DEFAULT_RELEASE_ARG="--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/$QUICKSTART_RELEASE.yml"
|
export QUICKSTART_DEFAULT_RELEASE_ARG="--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}/$QUICKSTART_RELEASE.yml"
|
||||||
|
|
||||||
declare -A RELEASE_ARGS=()
|
declare -A RELEASE_ARGS=()
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ function tapper(){
|
||||||
sudo chown centos /opt/stack/new
|
sudo chown centos /opt/stack/new
|
||||||
git clone https://git.openstack.org/openstack-infra/tripleo-ci /opt/stack/new/tripleo-ci
|
git clone https://git.openstack.org/openstack-infra/tripleo-ci /opt/stack/new/tripleo-ci
|
||||||
cd /opt/stack/new/tripleo-ci
|
cd /opt/stack/new/tripleo-ci
|
||||||
OVERRIDE_ZUUL_BRANCH= ZUUL_BRANCH=master WORKSPACE=/tmp TOCI_JOBTYPE=nonha DEVSTACK_GATE_TIMEOUT=180 ./toci_gate_test.sh
|
DISTRIBUTION=CentOS DISTRIBUTION_MAJOR_VERSION=7 OVERRIDE_ZUUL_BRANCH= ZUUL_BRANCH=master WORKSPACE=/tmp TOCI_JOBTYPE=nonha DEVSTACK_GATE_TIMEOUT=180 ./toci_gate_test.sh
|
||||||
exit 0
|
exit 0
|
||||||
EOF
|
EOF
|
||||||
set +x
|
set +x
|
||||||
|
|
|
@ -57,7 +57,7 @@ QUICKSTART_COLLECTLOGS_CMD="$LOCAL_WORKING_DIR/bin/ansible-playbook \
|
||||||
--tags all \
|
--tags all \
|
||||||
"
|
"
|
||||||
|
|
||||||
export QUICKSTART_DEFAULT_RELEASE_ARG="--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/$QUICKSTART_RELEASE.yml"
|
export QUICKSTART_DEFAULT_RELEASE_ARG="--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/${DISTRIBUTION:-CentOS}-${DISTRIBUTION_MAJOR_VERSION:-7}/$QUICKSTART_RELEASE.yml"
|
||||||
|
|
||||||
declare -A RELEASE_ARGS=()
|
declare -A RELEASE_ARGS=()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue