Set INSTALL_TEMPEST for train tempest jobs

The legacy tempest jobs in this branch do not work after Ia7238c2044053d77b559de544c22909c50e1a11f merged, and still need the old all-plugin tempest tox target. Proper fix would be to port the jobs to zuulv3, but in the meantime, this simpler workaround sets INSTALL_TEMPEST to restore old behaviour. This also drops the job running against os-ken master, not needed in stable branch Change-Id: I8298f8798492942bb1dea88fcc7940785f2dc0b2 Resolves-Bug: #1877146
2020-05-06 18:13:53 +02:00 · 2020-05-06 18:13:53 +02:00 · 5300489469
parent c2cf1cd067
commit 5300489469
7 changed files with 4 additions and 162 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@ -82,19 +82,6 @@
      - ^doc/.*$
      - ^releasenotes/.*$

- job:
-    name: neutron-dynamic-routing-dsvm-tempest-with-os-ken-master-scenario-ipv4
-    parent: legacy-dsvm-base
-    run: playbooks/neutron-dynamic-routing-dsvm-tempest-with-os-ken-master-scenario-ipv4/run.yaml
-    post-run: playbooks/neutron-dynamic-routing-dsvm-tempest-with-os-ken-master-scenario-ipv4/post.yaml
-    timeout: 7800
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/neutron
-      - openstack/neutron-dynamic-routing
-      - openstack/neutron-tempest-plugin
-      - openstack/tempest
-
 - project:
    templates:
      - check-requirements
@ -118,10 +105,6 @@
        - neutron-dynamic-routing-dsvm-tempest-scenario-basic
        - neutron-dynamic-routing-dsvm-tempest-scenario-ipv4
        - neutron-dynamic-routing-dsvm-tempest-scenario-ipv6
-    experimental:
-      jobs:
-        - neutron-dynamic-routing-dsvm-tempest-with-os-ken-master-scenario-ipv4
    periodic:
      jobs:
-        - neutron-dynamic-routing-dsvm-tempest-with-os-ken-master-scenario-ipv4
        - legacy-periodic-neutron-dynamic-routing-dsvm-tempest-with-ryu-master-scenario-ipv4
--- a/playbooks/neutron-dynamic-routing-dsvm-tempest-api/run.yaml
+++ b/playbooks/neutron-dynamic-routing-dsvm-tempest-api/run.yaml
@ -30,6 +30,7 @@
          set -x
          cat << 'EOF' >>"/tmp/dg-local.conf"
          [[local|localrc]]
+          INSTALL_TEMPEST=True
          enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing
          enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin

--- a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-basic/run.yaml
+++ b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-basic/run.yaml
@ -41,6 +41,7 @@
          export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS"
          export PROJECTS="openstack/neutron-tempest-plugin $PROJECTS"
          DEVSTACK_LOCAL_CONFIG="NEUTRON_CREATE_INITIAL_NETWORKS=False"
+          DEVSTACK_LOCAL_CONFIG+=$'\n'"INSTALL_TEMPEST=True"
          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing"
          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin"
          export DEVSTACK_LOCAL_CONFIG
--- a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv4/run.yaml
+++ b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv4/run.yaml
@ -41,6 +41,7 @@
          export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS"
          export PROJECTS="openstack/neutron-tempest-plugin $PROJECTS"
          DEVSTACK_LOCAL_CONFIG="NEUTRON_CREATE_INITIAL_NETWORKS=False"
+          DEVSTACK_LOCAL_CONFIG+=$'\n'"INSTALL_TEMPEST=True"
          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing"
          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin"
          export DEVSTACK_LOCAL_CONFIG
--- a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv6/run.yaml
+++ b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv6/run.yaml
@ -41,6 +41,7 @@
          export PROJECTS="openstack/neutron-tempest-plugin $PROJECTS"
          export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS"
          DEVSTACK_LOCAL_CONFIG="NEUTRON_CREATE_INITIAL_NETWORKS=False"
+          DEVSTACK_LOCAL_CONFIG+=$'\n'"INSTALL_TEMPEST=True"
          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing"
          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin"
          export DEVSTACK_LOCAL_CONFIG
--- a/playbooks/neutron-dynamic-routing-dsvm-tempest-with-os-ken-master-scenario-ipv4/post.yaml
+++ b/playbooks/neutron-dynamic-routing-dsvm-tempest-with-os-ken-master-scenario-ipv4/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-dynamic-routing-dsvm-tempest-with-os-ken-master-scenario-ipv4/run.yaml
+++ b/playbooks/neutron-dynamic-routing-dsvm-tempest-with-os-ken-master-scenario-ipv4/run.yaml
@ -1,65 +0,0 @@
- hosts: all
-  name: Autoconverted job legacy-neutron-dynamic-routing-dsvm-tempest-with-os-ken-master-scenario-ipv4
-    from old job gate-neutron-dynamic-routing-dsvm-tempest-with-os-ken-master-scenario-ipv4-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
-          export DEVSTACK_GATE_USE_PYTHON3=True
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_REGEX="^neutron_dynamic_routing.tests.tempest.scenario.ipv4\."
-          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
-          export DEVSTACK_GATE_NEUTRON=1
-          export BRANCH_OVERRIDE=default
-          if [[ "$BRANCH_OVERRIDE" != "default" ]] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS"
-          export PROJECTS="openstack/neutron-tempest-plugin $PROJECTS"
-          DEVSTACK_LOCAL_CONFIG="NEUTRON_CREATE_INITIAL_NETWORKS=False"
-          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing"
-          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin"
-          if [[ "ipv4" == "basic" ]]; then
-              DEVSTACK_LOCAL_CONFIG+=$'\n'"BGP_SCHEDULER_DRIVER=neutron_dynamic_routing.services.bgp.scheduler.bgp_dragent_scheduler.ChanceScheduler"
-          fi
-          export DEVSTACK_LOCAL_CONFIG
-
-          function gate_hook {
-              local os_ken_path=$BASE/new/os_ken_master
-              if [[ ! -d $os_ken_path ]]; then
-                  git clone https://opendev.org/openstack/os-ken $os_ken_path
-              fi
-              sudo pip install -e $os_ken_path
-              bash -xe $BASE/new/neutron-dynamic-routing/neutron_dynamic_routing/tests/contrib/gate_hook.sh dsvm-scenario
-          }
-          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 }}'