Convert legacy functional jobs to Zuul-v3-native
Follow the guidelines from the Infra[1] and QA[2] teams to properly set up our functional tests. This patch leaves the experimental grenade jobs alone for now since there does not yet seem to be an existing Zuul-v3-native grenade job to use as a parent. [1] https://docs.openstack.org/infra/manual/zuulv3.html#reworking-legacy-jobs-to-be-v3-native [2] https://docs.openstack.org/devstack/latest/zuul_ci_jobs_migration.html Change-Id: Iabf40c723f2611c7eeb0a289b7ff594766a3452e
This commit is contained in:
Colleen Murphy
parent
50b2d6aa0e
commit
1a5bbb5677
53
.zuul.yaml
53
.zuul.yaml
|
|
@ -12,9 +12,7 @@
|
|||
|
||||
- job:
|
||||
name: keystone-dsvm-functional
|
||||
parent: legacy-dsvm-base
|
||||
run: playbooks/legacy/keystone-dsvm-functional/run.yaml
|
||||
post-run: playbooks/legacy/keystone-dsvm-functional/post.yaml
|
||||
parent: devstack-tempest
|
||||
timeout: 4200
|
||||
required-projects:
|
||||
- openstack-infra/devstack-gate
|
||||
|
|
@ -27,44 +25,33 @@
|
|||
- ^etc/.*$
|
||||
- ^keystone/tests/unit/.*$
|
||||
- ^releasenotes/.*$
|
||||
vars:
|
||||
tox_envlist: all
|
||||
tempest_test_regex: 'keystone_tempest_plugin'
|
||||
devstack_localrc:
|
||||
TEMPEST_PLUGINS: '/opt/stack/keystone-tempest-plugin'
|
||||
|
||||
- job:
|
||||
name: keystone-dsvm-functional-federation
|
||||
parent: legacy-dsvm-base
|
||||
run: playbooks/legacy/keystone-dsvm-functional-federation/run.yaml
|
||||
post-run: playbooks/legacy/keystone-dsvm-functional-federation/post.yaml
|
||||
timeout: 4200
|
||||
parent: keystone-dsvm-functional
|
||||
voting: false
|
||||
required-projects:
|
||||
- openstack-infra/devstack-gate
|
||||
- openstack/keystone
|
||||
- openstack/keystone-tempest-plugin
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^api-ref/.*$
|
||||
- ^doc/.*$
|
||||
- ^etc/.*$
|
||||
- ^keystone/tests/unit/.*$
|
||||
- ^releasenotes/.*$
|
||||
vars:
|
||||
devstack_localrc:
|
||||
TEMPEST_PLUGINS: '/opt/stack/keystone-tempest-plugin'
|
||||
devstack_services:
|
||||
keystone-saml2-federation: true
|
||||
tls-proxy: false
|
||||
devstack_plugins:
|
||||
keystone: git://git.openstack.org/openstack/keystone
|
||||
|
||||
- job:
|
||||
name: keystone-dsvm-py35-functional-federation
|
||||
parent: legacy-dsvm-base
|
||||
run: playbooks/legacy/keystone-dsvm-py35-functional-federation/run.yaml
|
||||
post-run: playbooks/legacy/keystone-dsvm-py35-functional-federation/post.yaml
|
||||
timeout: 4200
|
||||
parent: keystone-dsvm-functional-federation
|
||||
voting: false
|
||||
required-projects:
|
||||
- openstack-infra/devstack-gate
|
||||
- openstack/keystone
|
||||
- openstack/keystone-tempest-plugin
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^api-ref/.*$
|
||||
- ^doc/.*$
|
||||
- ^etc/.*$
|
||||
- ^keystone/tests/unit/.*$
|
||||
- ^releasenotes/.*$
|
||||
vars:
|
||||
devstack_localrc:
|
||||
TEMPEST_PLUGINS: '/opt/stack/keystone-tempest-plugin'
|
||||
USE_PYTHON3: True
|
||||
|
||||
# This job will execute 'tox -e upgrade' from the OSA
|
||||
# repo specified in 'osa_test_repo'.
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
- hosts: primary
|
||||
tasks:
|
||||
|
||||
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
|
||||
synchronize:
|
||||
src: '{{ ansible_user_dir }}/workspace/'
|
||||
dest: '{{ zuul.executor.log_root }}'
|
||||
mode: pull
|
||||
copy_links: true
|
||||
verify_host: true
|
||||
rsync_opts:
|
||||
- --include=/logs/**
|
||||
- --include=*/
|
||||
- --exclude=*
|
||||
- --prune-empty-dirs
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
- hosts: all
|
||||
name: Autoconverted job legacy-keystone-dsvm-functional-v3-only modified to run federation
|
||||
tasks:
|
||||
|
||||
- name: Ensure legacy workspace directory
|
||||
file:
|
||||
path: '{{ ansible_user_dir }}/workspace'
|
||||
state: directory
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
cat > clonemap.yaml << EOF
|
||||
clonemap:
|
||||
- name: openstack-infra/devstack-gate
|
||||
dest: devstack-gate
|
||||
EOF
|
||||
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
|
||||
git://git.openstack.org \
|
||||
openstack-infra/devstack-gate
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
TEMPEST_PLUGINS='/opt/stack/new/keystone-tempest-plugin'
|
||||
enable_plugin keystone git://git.openstack.org/openstack/keystone
|
||||
|
||||
EOF
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
export PYTHONUNBUFFERED=true
|
||||
export PROJECTS="openstack/keystone-tempest-plugin $PROJECTS"
|
||||
export DEVSTACK_GATE_TEMPEST=1
|
||||
export BRANCH_OVERRIDE=default
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
fi
|
||||
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX='keystone_tempest_plugin'
|
||||
export ENABLED_SERVICES=keystone-saml2-federation
|
||||
|
||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||
./safe-devstack-vm-gate-wrap.sh
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
- hosts: primary
|
||||
tasks:
|
||||
|
||||
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
|
||||
synchronize:
|
||||
src: '{{ ansible_user_dir }}/workspace/'
|
||||
dest: '{{ zuul.executor.log_root }}'
|
||||
mode: pull
|
||||
copy_links: true
|
||||
verify_host: true
|
||||
rsync_opts:
|
||||
- --include=/logs/**
|
||||
- --include=*/
|
||||
- --exclude=*
|
||||
- --prune-empty-dirs
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
- hosts: all
|
||||
name: Autoconverted job legacy-keystone-dsvm-functional from old job gate-keystone-dsvm-functional-ubuntu-xenial
|
||||
tasks:
|
||||
|
||||
- name: Ensure legacy workspace directory
|
||||
file:
|
||||
path: '{{ ansible_user_dir }}/workspace'
|
||||
state: directory
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
cat > clonemap.yaml << EOF
|
||||
clonemap:
|
||||
- name: openstack-infra/devstack-gate
|
||||
dest: devstack-gate
|
||||
EOF
|
||||
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
|
||||
git://git.openstack.org \
|
||||
openstack-infra/devstack-gate
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
TEMPEST_PLUGINS='/opt/stack/new/keystone-tempest-plugin'
|
||||
|
||||
EOF
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
export PYTHONUNBUFFERED=true
|
||||
export PROJECTS="openstack/keystone-tempest-plugin $PROJECTS"
|
||||
export DEVSTACK_GATE_TEMPEST=1
|
||||
export BRANCH_OVERRIDE=default
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
fi
|
||||
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX='keystone_tempest_plugin'
|
||||
|
||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||
./safe-devstack-vm-gate-wrap.sh
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
- hosts: primary
|
||||
tasks:
|
||||
|
||||
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
|
||||
synchronize:
|
||||
src: '{{ ansible_user_dir }}/workspace/'
|
||||
dest: '{{ zuul.executor.log_root }}'
|
||||
mode: pull
|
||||
copy_links: true
|
||||
verify_host: true
|
||||
rsync_opts:
|
||||
- --include=/logs/**
|
||||
- --include=*/
|
||||
- --exclude=*
|
||||
- --prune-empty-dirs
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
- hosts: all
|
||||
name: Autoconverted job legacy-keystone-dsvm-py35-functional-federation
|
||||
tasks:
|
||||
|
||||
- name: Ensure legacy workspace directory
|
||||
file:
|
||||
path: '{{ ansible_user_dir }}/workspace'
|
||||
state: directory
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
cat > clonemap.yaml << EOF
|
||||
clonemap:
|
||||
- name: openstack-infra/devstack-gate
|
||||
dest: devstack-gate
|
||||
EOF
|
||||
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
|
||||
git://git.openstack.org \
|
||||
openstack-infra/devstack-gate
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
cat << 'EOF' >>"/tmp/dg-local.conf"
|
||||
[[local|localrc]]
|
||||
TEMPEST_PLUGINS='/opt/stack/new/keystone-tempest-plugin'
|
||||
# swift is not ready for python3 yet
|
||||
disable_service s-account
|
||||
disable_service s-container
|
||||
disable_service s-object
|
||||
disable_service s-proxy
|
||||
enable_plugin keystone git://git.openstack.org/openstack/keystone
|
||||
|
||||
EOF
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
||||
export PYTHONUNBUFFERED=true
|
||||
export PROJECTS="openstack/keystone-tempest-plugin $PROJECTS"
|
||||
export DEVSTACK_GATE_TEMPEST=1
|
||||
|
||||
export BRANCH_OVERRIDE=default
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
fi
|
||||
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX='keystone_tempest_plugin'
|
||||
export ENABLED_SERVICES=keystone-saml2-federation
|
||||
|
||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||
./safe-devstack-vm-gate-wrap.sh
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
Loading…
Reference in New Issue