Switch neutron-fwaas-fullstack job to zuulv3 syntax

This patch switches neutron-fwaas-fullstack to Zuul v3 syntax and to inherits from neutron-fullstack job definition. It also removed neutron-fwaas-fullstack-python35 job definition as this job wasn't run anywhere and now as neutron-fwaas-fullstack will inherits from neutron-fullstack it will run on python 3. Depends-On: https://review.opendev.org/#/c/647931/ Change-Id: I4c08367d7e0670b3f8219b281af22632d53fcdae Related-Bug: #1804844
2019-03-19 10:45:19 +01:00 · 2019-03-19 10:45:19 +01:00 · 9f78072ccc
parent ea57fce620
commit 9f78072ccc
6 changed files with 13 additions and 166 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@ -26,36 +26,10 @@
        - legacy-neutron-fwaas-dsvm-functional
    experimental:
      jobs:
-        - legacy-neutron-fwaas-dsvm-fullstack
+        - neutron-fwaas-fullstack

 - job:
    name: neutron-fwaas-fullstack
-    parent: legacy-dsvm-base
-    run: playbooks/neutron-fwaas-fullstack/run.yaml
-    post-run: playbooks/neutron-fwaas-fullstack/post.yaml
-    timeout: 7800
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/neutron
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^neutron/locale/.*$
-      - ^releasenotes/.*$
-
-
- job:
-    name: neutron-fwaas-fullstack-python35
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/neutron-fullstack-python35/run.yaml
-    post-run: playbooks/legacy/neutron-fullstack-python35/post.yaml
-    timeout: 7800
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/neutron
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^neutron/locale/.*$
-      - ^releasenotes/.*$
-    voting: false
+    parent: neutron-fullstack
+    vars:
+      project_name: neutron-fwaas
--- a/neutron_fwaas/tests/contrib/post_test_hook.sh
+++ b/neutron_fwaas/tests/contrib/post_test_hook.sh
@ -26,7 +26,7 @@ function dsvm_functional_prep_func {
    :
 }

-if [[ "$venv" == dsvm-functional* ]] || [[ "$venv" == dsvm-fullstack* ]]
+if [[ "$venv" == dsvm-functional* ]]
 then
    owner=stack
    sudo_env=
--- a/playbooks/neutron-fwaas-fullstack/post.yaml
+++ b/playbooks/neutron-fwaas-fullstack/post.yaml
@ -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
--- a/playbooks/neutron-fwaas-fullstack/run.yaml
+++ b/playbooks/neutron-fwaas-fullstack/run.yaml
@ -1,53 +0,0 @@
- hosts: all
-  name: neutron-fwaas-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
-          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
-
-          function gate_hook {
-              bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-fullstack
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-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 }}'
--- a/tools/deploy_rootwrap.sh
+++ b/tools/deploy_rootwrap.sh
@ -57,6 +57,8 @@ sed -i "s:^\(exec_dirs=.*\)$:\1,${target_bin_path}:" ${dst_conf}
 if [[ "$OS_SUDO_TESTING" = "1" ]]; then
    sed -i 's/use_syslog=False/use_syslog=True/g' ${dst_conf}
    sed -i 's/syslog_log_level=ERROR/syslog_log_level=DEBUG/g' ${dst_conf}
+    cp -p ${neutron_path}/neutron/tests/contrib/testing.filters \
+        ${dst_rootwrap_path}/
    cp -p ${fwaas_path}/neutron_fwaas/tests/contrib/functional-testing.filters \
        ${dst_rootwrap_path}/
 fi
--- a/tox.ini
+++ b/tox.ini
@ -47,10 +47,14 @@ basepython = python3
 setenv = {[testenv]setenv}
         {[testenv:common]setenv}
         {[testenv:dsvm]setenv}
+         OS_NEUTRON_PATH={env:OS_NEUTRON_PATH:/home/zuul/src/opendev.org/openstack/neutron}
         # workaround for DB teardown lock contention (bug/1541742)
-         OS_TEST_TIMEOUT=600
+         OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:600}
         OS_TEST_PATH=./neutron_fwaas/tests/fullstack
-sitepackages=True
+commands =
+  {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
+  stestr run --concurrency 4 {posargs}
+

 [testenv:api]
 basepython = python3