Migrate undercloud jobs to the new base configurations
This changes make the undercloud jobs use the new base jobs, nodeset and playbooks requireed to run the job with the configuration that are closer to zuulv3. It also adds logic to not run any vxlan networking on our own for all the v3 runners. Change-Id: Idf7b8a54499ef252bf7d34b3b5f16a9a34e6a83f
This commit is contained in:
parent
4101a393f2
commit
bc05b89289
|
@ -51,6 +51,9 @@
|
|||
|
||||
export PYTHONUNBUFFERED=true
|
||||
export TRIPLEO_ROOT={{ ansible_user_dir }}/workspace
|
||||
# NOTE(trown) We can move this into the multinode environment file once we
|
||||
# migrate the 2-node jobs over to zuulv3
|
||||
export VXLAN_VARS="-e toci_vxlan_networking='false' -e vxlan_networking='false'"
|
||||
|
||||
bash -xe $TRIPLEO_ROOT/tripleo-ci/toci_gate_test.sh
|
||||
executable: /bin/bash
|
||||
|
|
|
@ -80,6 +80,7 @@ export CONTROLLER_HOSTS=
|
|||
export SUBNODES_SSH_KEY=
|
||||
TIMEOUT_SECS=$((DEVSTACK_GATE_TIMEOUT*60))
|
||||
export EXTRA_VARS=${EXTRA_VARS:-""}
|
||||
export VXLAN_VARS=${VXLAN_VARS:-""}
|
||||
export NODES_ARGS=""
|
||||
export EXTRANODE=""
|
||||
# Set playbook execution status
|
||||
|
|
|
@ -128,6 +128,7 @@ for playbook in $PLAYBOOKS; do
|
|||
$FEATURESET_CONF \
|
||||
$ENV_VARS \
|
||||
$EXTRA_VARS \
|
||||
$VXLAN_VARS \
|
||||
$DEFAULT_ARGS \
|
||||
$LOCAL_WORKING_DIR/playbooks/$playbook ${PLAYBOOKS_ARGS[$playbook]:-}" \
|
||||
| sed 's/--/\n--/g' \
|
||||
|
@ -147,6 +148,7 @@ else
|
|||
$FEATURESET_CONF \
|
||||
$ENV_VARS \
|
||||
$EXTRA_VARS \
|
||||
$VXLAN_VARS \
|
||||
$DEFAULT_ARGS \
|
||||
--extra-vars ci_job_end_time=$(( START_JOB_TIME + REMAINING_TIME*60 )) \
|
||||
$LOCAL_WORKING_DIR/playbooks/$playbook "${PLAYBOOKS_ARGS[$playbook]:-}" \
|
||||
|
|
|
@ -19,5 +19,11 @@
|
|||
- nodeset:
|
||||
name: single-centos-7-node
|
||||
nodes:
|
||||
- name: centos-7
|
||||
- name: primary
|
||||
label: centos-7
|
||||
groups:
|
||||
- name: switch
|
||||
nodes:
|
||||
- primary
|
||||
- name: peers
|
||||
nodes: []
|
||||
|
|
|
@ -19,43 +19,40 @@
|
|||
|
||||
- job:
|
||||
name: tripleo-ci-centos-7-undercloud-containers
|
||||
parent: tripleo-ci-dsvm
|
||||
run: playbooks/tripleo-ci/run.yaml
|
||||
parent: tripleo-ci-base
|
||||
post-run: playbooks/tripleo-ci/post.yaml
|
||||
timeout: 10800
|
||||
nodeset: legacy-centos-7
|
||||
nodeset: single-centos-7-node
|
||||
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
|
||||
vars:
|
||||
toci_jobtype: singlenode-featureset027
|
||||
|
||||
- job:
|
||||
name: tripleo-ci-centos-7-undercloud-oooq
|
||||
parent: tripleo-ci-dsvm
|
||||
run: playbooks/tripleo-ci/run.yaml
|
||||
parent: tripleo-ci-base
|
||||
post-run: playbooks/tripleo-ci/post.yaml
|
||||
timeout: 10800
|
||||
voting: false
|
||||
nodeset: legacy-centos-7
|
||||
nodeset: single-centos-7-node
|
||||
vars:
|
||||
toci_jobtype: singlenode-featureset003
|
||||
|
||||
- job:
|
||||
name: tripleo-ci-centos-7-undercloud-upgrades
|
||||
parent: tripleo-ci-dsvm
|
||||
run: playbooks/tripleo-ci/run.yaml
|
||||
parent: tripleo-ci-base
|
||||
post-run: playbooks/tripleo-ci/post.yaml
|
||||
timeout: 10800
|
||||
nodeset: legacy-centos-7
|
||||
nodeset: single-centos-7-node
|
||||
branches: ^(?!stable/(newton|ocata)).*$
|
||||
vars:
|
||||
toci_jobtype: singlenode-featureset047
|
||||
|
||||
- job:
|
||||
name: tripleo-ci-centos-7-containerized-undercloud-upgrades
|
||||
parent: tripleo-ci-dsvm
|
||||
run: playbooks/tripleo-ci/run.yaml
|
||||
parent: tripleo-ci-base
|
||||
post-run: playbooks/tripleo-ci/post.yaml
|
||||
timeout: 10800
|
||||
nodeset: legacy-centos-7
|
||||
nodeset: single-centos-7-node
|
||||
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
|
||||
vars:
|
||||
toci_jobtype: singlenode-featureset050
|
||||
|
|
Loading…
Reference in New Issue