commit 4f203945efdc0ace46aba25873a9b8f441da21bb Author: elajkat Date: Sun Aug 23 17:15:10 2020 +0200 Migrate legacy grenade job to be native Zuul v3 Change-Id: I48b7691f2de6fb3054e31068f3ccf93396390dd9 diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index 9342e58..7ff9b99 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -282,17 +282,48 @@ - ^tools/.*$ - ^tox.ini$ -# >>> LEGACY JOBS TO REPLACE - - job: name: networking-odl-grenade - parent: legacy-dsvm-base - run: playbooks/legacy/grenade-dsvm-networking-odl/run.yaml - post-run: playbooks/legacy/grenade-dsvm-networking-odl/post.yaml + parent: grenade-multinode timeout: 9000 + irrelevant-files: *irrelevant_files + roles: + - zuul: openstack/neutron-tempest-plugin required-projects: - - openstack/grenade - - openstack/devstack-gate - - openstack/networking-odl - -# <<< LEGACY JOBS TO REPLACE + - opendev.org/openstack/grenade + - opendev.org/openstack/networking-odl + - opendev.org/openstack/neutron + - opendev.org/openstack/ceilometer + - opendev.org/x/networking-l2gw + - opendev.org/openstack/networking-sfc + - opendev.org/openstack/networking-bgpvpn + - opendev.org/openstack/neutron-tempest-plugin + vars: + <<: *devstack_vars + tox_envlist: all + devstack_plugins: + neutron: https://opendev.org/openstack/neutron + networking-odl: https://opendev.org/openstack/networking-odl + tempest_test_regex: tempest\.(api.compute|scenario|thirdparty) + tempest_test_blacklist: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/tempest-blacklist.txt" + devstack_services: + c-bak: false + etcd: false + ovs-vswitchd: true + ovsdb-server: true + placement-api: true + q-svc: true + q-agt: false + q-dhcp: true + q-l3: false + q-meta: true + q-metering: false + # When running python3 Swift should be disabled for now + s-account: false + s-container: false + s-object: false + s-proxy: false + tls-proxy: false + grenade_devstack_localrc: + shared: + ODL_RELEASE: *sodium diff --git a/playbooks/legacy/grenade-dsvm-networking-odl/post.yaml b/playbooks/legacy/grenade-dsvm-networking-odl/post.yaml deleted file mode 100644 index dac8753..0000000 --- a/playbooks/legacy/grenade-dsvm-networking-odl/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/legacy/grenade-dsvm-networking-odl/run.yaml b/playbooks/legacy/grenade-dsvm-networking-odl/run.yaml deleted file mode 100644 index c1fc0b8..0000000 --- a/playbooks/legacy/grenade-dsvm-networking-odl/run.yaml +++ /dev/null @@ -1,49 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-grenade-dsvm-networking-odl from old job gate-grenade-dsvm-networking-odl-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 - # Set this variable for grenade job to be identified and use lib/neutron-legacy - # for base release and lib/neutron for target release - export IS_GRENADE_JOB=True - export PROJECTS="openstack/grenade openstack/networking-odl $PROJECTS" - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_GRENADE=pullup - export GRENADE_PLUGINRC="enable_grenade_plugin networking-odl https://opendev.org/openstack/networking-odl" - export DEVSTACK_GATE_NEUTRON=1 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-odl/devstack/devstackgaterc - 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 }}'