From 055745136e5715f0f5bb1828cbcc46cf9be145ba Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Sun, 19 Jul 2020 03:50:38 +0000 Subject: [PATCH] Migrate jobs to zuulv3 native Migrate the following jobs to zuul v3: * kuryr-libnetwork-fullstack-py3 * kuryr-libnetwork-kuryr_lib-src-fullstack * kuryr-libnetwork-install * kuryr-libnetwork-fullstack-ipv6-only Remove the following unused jobs: * kuryr-libnetwork-install-multinode Change-Id: I54d784fe0bded5f461ba9f26ed901ec042a6bd0d --- .zuul.yaml | 92 +++++++++++-------- .../kuryr-libnetwork-fullstack-base/post.yaml | 80 ---------------- .../run-ipv6.yaml | 80 ---------------- .../kuryr-libnetwork-fullstack-base/run.yaml | 73 --------------- .../post.yaml | 15 --- .../run.yaml | 73 --------------- playbooks/kuryr-libnetwork-install/post.yaml | 15 --- playbooks/kuryr-libnetwork-install/run.yaml | 72 --------------- playbooks/post_fullstack_job.yaml | 4 + playbooks/run_fullstack_job.yaml | 5 + 10 files changed, 62 insertions(+), 447 deletions(-) delete mode 100644 playbooks/kuryr-libnetwork-fullstack-base/post.yaml delete mode 100644 playbooks/kuryr-libnetwork-fullstack-base/run-ipv6.yaml delete mode 100644 playbooks/kuryr-libnetwork-fullstack-base/run.yaml delete mode 100644 playbooks/kuryr-libnetwork-install-multinode/post.yaml delete mode 100644 playbooks/kuryr-libnetwork-install-multinode/run.yaml delete mode 100644 playbooks/kuryr-libnetwork-install/post.yaml delete mode 100644 playbooks/kuryr-libnetwork-install/run.yaml create mode 100644 playbooks/post_fullstack_job.yaml create mode 100644 playbooks/run_fullstack_job.yaml diff --git a/.zuul.yaml b/.zuul.yaml index cb4cba2b..8a36e44e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,18 +1,27 @@ - job: name: kuryr-libnetwork-fullstack-base - parent: legacy-dsvm-base - vars: + parent: devstack-tox-functional + vars: &base_vars use_python3: 1 use_src: 0 - run: playbooks/kuryr-libnetwork-fullstack-base/run.yaml - post-run: playbooks/kuryr-libnetwork-fullstack-base/post.yaml + devstack_localrc: + KURYR_CONFIG_DIR: /etc/kuryr-libnetwork + tox_envlist: fullstack + tox_install_siblings: false + devstack_plugins: + kuryr-libnetwork: https://opendev.org/openstack/kuryr-libnetwork + devstack-plugin-container: https://opendev.org/openstack/devstack-plugin-container + run: playbooks/run_fullstack_job.yaml + post-run: playbooks/post_fullstack_job.yaml timeout: 7800 required-projects: - - openstack/devstack-gate - - openstack/devstack-plugin-container - - openstack/kuryr - - openstack/kuryr-libnetwork - irrelevant-files: + - opendev.org/openstack/devstack + - opendev.org/openstack/devstack-plugin-container + - opendev.org/openstack/kuryr + - opendev.org/openstack/kuryr-libnetwork + roles: + - zuul: opendev.org/openstack/devstack + irrelevant-files: &base_irrelevant_files - ^.*\.rst$ - ^doc/.*$ @@ -25,54 +34,62 @@ devstack_plugins: rally-openstack: https://opendev.org/openstack/rally-openstack kuryr-libnetwork: http://opendev.org/openstack/kuryr-libnetwork - devstack-plugin-container: https://github.com/openstack/devstack-plugin-container + devstack-plugin-container: https://opendev.org/openstack/devstack-plugin-container devstack_localrc: USE_PYTHON3: True devstack_local_config: KURYR_CONFIG_DIR: /etc/kuryr-libnetwork rally_task: rally-jobs/kuryr-libnetwork.yaml required-projects: - - openstack/rally-openstack - - openstack/kuryr - - openstack/kuryr-libnetwork - - openstack/devstack-plugin-container + - opendev.org/openstack/rally-openstack + - opendev.org/openstack/kuryr + - opendev.org/openstack/kuryr-libnetwork + - opendev.org/openstack/devstack-plugin-container voting: false - job: name: kuryr-libnetwork-install - parent: legacy-dsvm-base - run: playbooks/kuryr-libnetwork-install/run.yaml - post-run: playbooks/kuryr-libnetwork-install/post.yaml + parent: devstack timeout: 7800 required-projects: - - openstack/devstack-gate - - openstack/devstack-plugin-container - - openstack/kuryr - - openstack/kuryr-libnetwork + - opendev.org/openstack/devstack + - opendev.org/openstack/devstack-plugin-container + - opendev.org/openstack/kuryr + - opendev.org/openstack/kuryr-libnetwork + roles: + - zuul: opendev.org/openstack/devstack + vars: + devstack_localrc: + KURYR_CONFIG_DIR: /etc/kuryr-libnetwork + KURYR_CAPABILITY_SCOPE: global + devstack_plugins: + devstack-plugin-container: https://opendev.org/openstack/devstack-plugin-container + kuryr-libnetwork: https://opendev.org/openstack/kuryr-libnetwork voting: false -- job: - name: kuryr-libnetwork-install-multinode - parent: legacy-dsvm-base-multinode - run: playbooks/kuryr-libnetwork-install-multinode/run.yaml - post-run: playbooks/kuryr-libnetwork-install-multinode/post.yaml - timeout: 7800 - required-projects: - - openstack/devstack-gate - - openstack/devstack-plugin-container - - openstack/kuryr - - openstack/kuryr-libnetwork - - job: name: kuryr-libnetwork-fullstack-py3 parent: kuryr-libnetwork-fullstack-base - job: name: kuryr-libnetwork-fullstack-ipv6-only - parent: kuryr-libnetwork-fullstack-py3 - run: playbooks/kuryr-libnetwork-fullstack-base/run-ipv6.yaml + parent: devstack-tempest-ipv6 + irrelevant-files: *base_irrelevant_files required-projects: - - openstack/tempest + - opendev.org/openstack/devstack + - opendev.org/openstack/devstack-plugin-container + - opendev.org/openstack/kuryr + - opendev.org/openstack/kuryr-libnetwork + - opendev.org/openstack/tempest + vars: + <<: *base_vars + devstack_services: + s-account: false + s-object: false + s-container: false + s-proxy: false + run: playbooks/run_fullstack_job.yaml + post-run: playbooks/post_fullstack_job.yaml - job: name: kuryr-libnetwork-kuryr_lib-src-fullstack @@ -115,6 +132,3 @@ - kuryr-libnetwork-kuryr_lib-src-fullstack - kuryr-libnetwork-fullstack-py3 - kuryr-libnetwork-fullstack-ipv6-only - experimental: - jobs: - - kuryr-libnetwork-install-multinode diff --git a/playbooks/kuryr-libnetwork-fullstack-base/post.yaml b/playbooks/kuryr-libnetwork-fullstack-base/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/kuryr-libnetwork-fullstack-base/post.yaml +++ /dev/null @@ -1,80 +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=**/*nose_results.html - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=**/*testr_results.html.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=/.testrepository/tmp* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=**/*testrepository.subunit.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}/tox' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.tox/*/log/* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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 diff --git a/playbooks/kuryr-libnetwork-fullstack-base/run-ipv6.yaml b/playbooks/kuryr-libnetwork-fullstack-base/run-ipv6.yaml deleted file mode 100644 index 6489fe7a..00000000 --- a/playbooks/kuryr-libnetwork-fullstack-base/run-ipv6.yaml +++ /dev/null @@ -1,80 +0,0 @@ -- hosts: all - name: IPv6 job for kuryr-libnetwork-dsvm-fullstack - 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/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/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]] - enable_plugin kuryr-libnetwork http://opendev.org/openstack/kuryr-libnetwork - SERVICE_IP_VERSION=6 - SERVICE_HOST="" - # IPv6 and certificates known issue with python2 - # https://bugs.launchpad.net/devstack/+bug/1794929 - USE_PYTHON3=True - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - export PROJECTS="openstack/kuryr-libnetwork $PROJECTS" - if [ "{{ use_src }}" -eq 1 ] ; then - export DEVSTACK_PROJECT_FROM_GIT="kuryr" - fi - export PROJECTS="openstack/devstack-plugin-container $PROJECTS" - - function gate_hook { - bash -xe $BASE/new/kuryr-libnetwork/kuryr_libnetwork/tests/contrib/gate_hook.sh fullstack - } - export -f gate_hook - - function post_test_hook { - bash -xe $BASE/new/kuryr-libnetwork/kuryr_libnetwork/tests/contrib/post_test_hook.sh fullstack - cd $BASE/new/tempest/tools - ./verify-ipv6-only-deployments.sh - } - export -f post_test_hook - - 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 }}' diff --git a/playbooks/kuryr-libnetwork-fullstack-base/run.yaml b/playbooks/kuryr-libnetwork-fullstack-base/run.yaml deleted file mode 100644 index ffc707b3..00000000 --- a/playbooks/kuryr-libnetwork-fullstack-base/run.yaml +++ /dev/null @@ -1,73 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-kuryr-libnetwork-dsvm-fullstack from old job gate-kuryr-libnetwork-dsvm-fullstack-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/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/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]] - enable_plugin kuryr-libnetwork http://opendev.org/openstack/kuryr-libnetwork - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export DEVSTACK_GATE_USE_PYTHON3=True - export PROJECTS="openstack/kuryr-libnetwork $PROJECTS" - if [ "{{ use_src }}" -eq 1 ] ; then - export DEVSTACK_PROJECT_FROM_GIT="kuryr" - fi - export PROJECTS="openstack/devstack-plugin-container $PROJECTS" - - function gate_hook { - bash -xe $BASE/new/kuryr-libnetwork/kuryr_libnetwork/tests/contrib/gate_hook.sh fullstack - } - export -f gate_hook - - function post_test_hook { - bash -xe $BASE/new/kuryr-libnetwork/kuryr_libnetwork/tests/contrib/post_test_hook.sh fullstack - } - export -f post_test_hook - - 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 }}' diff --git a/playbooks/kuryr-libnetwork-install-multinode/post.yaml b/playbooks/kuryr-libnetwork-install-multinode/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/kuryr-libnetwork-install-multinode/post.yaml +++ /dev/null @@ -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 diff --git a/playbooks/kuryr-libnetwork-install-multinode/run.yaml b/playbooks/kuryr-libnetwork-install-multinode/run.yaml deleted file mode 100644 index 04bfe279..00000000 --- a/playbooks/kuryr-libnetwork-install-multinode/run.yaml +++ /dev/null @@ -1,73 +0,0 @@ -- hosts: primary - name: Autoconverted job legacy-install-dsvm-kuryr-libnetwork-multinode from old - job gate-install-dsvm-kuryr-libnetwork-multinode-ubuntu-xenial-nv - 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/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/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]] - enable_plugin kuryr-libnetwork http://opendev.org/openstack/kuryr-libnetwork - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_USE_PYTHON3=True - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - if [ "-multinode" == "-multinode" ]; then - export CAPABILITY_SCOPE="global" - fi - - export PROJECTS="openstack/kuryr-libnetwork $PROJECTS" - export PROJECTS="openstack/devstack-plugin-container $PROJECTS" - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - - function gate_hook { - bash -xe $BASE/new/kuryr-libnetwork/kuryr_libnetwork/tests/contrib/gate_hook.sh - } - export -f gate_hook - - 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 }}' diff --git a/playbooks/kuryr-libnetwork-install/post.yaml b/playbooks/kuryr-libnetwork-install/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/kuryr-libnetwork-install/post.yaml +++ /dev/null @@ -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 diff --git a/playbooks/kuryr-libnetwork-install/run.yaml b/playbooks/kuryr-libnetwork-install/run.yaml deleted file mode 100644 index 59bbb7fc..00000000 --- a/playbooks/kuryr-libnetwork-install/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-install-dsvm-kuryr-libnetwork from old job gate-install-dsvm-kuryr-libnetwork-ubuntu-xenial-nv - 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/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/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]] - enable_plugin kuryr-libnetwork http://opendev.org/openstack/kuryr-libnetwork - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_USE_PYTHON3=True - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - if [ "" == "-multinode" ]; then - export CAPABILITY_SCOPE="global" - fi - - export PROJECTS="openstack/kuryr-libnetwork $PROJECTS" - export PROJECTS="openstack/devstack-plugin-container $PROJECTS" - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - - function gate_hook { - bash -xe $BASE/new/kuryr-libnetwork/kuryr_libnetwork/tests/contrib/gate_hook.sh - } - export -f gate_hook - - 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 }}' diff --git a/playbooks/post_fullstack_job.yaml b/playbooks/post_fullstack_job.yaml new file mode 100644 index 00000000..7f0cb198 --- /dev/null +++ b/playbooks/post_fullstack_job.yaml @@ -0,0 +1,4 @@ +- hosts: all + roles: + - fetch-tox-output + - fetch-subunit-output diff --git a/playbooks/run_fullstack_job.yaml b/playbooks/run_fullstack_job.yaml new file mode 100644 index 00000000..b414b747 --- /dev/null +++ b/playbooks/run_fullstack_job.yaml @@ -0,0 +1,5 @@ +- hosts: all + roles: + - run-devstack + - ensure-tox + - tox