Merge "Replace legacy tempest-dsvm-py35"

playbooks/legacy/tempest-dsvm-py35/post.yaml

@@ -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

playbooks/legacy/tempest-dsvm-py35/run.yaml

@@ -1,65 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-tempest-dsvm-py35 from old job gate-tempest-dsvm-py35-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]]
-          # swift is not ready for python3 yet
-          disable_service s-account
-          disable_service s-container
-          disable_service s-object
-          disable_service s-proxy
-          # without Swift, c-bak cannot run (in the Gate at least)
-          disable_service c-bak
-
-          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 DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_CONFIGDRIVE=1
-          export DEVSTACK_GATE_TLSPROXY=1
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          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 }}'

zuul.d/project-templates.yaml

@@ -1003,3 +1003,17 @@
       jobs:
         - ansible-role-functional-ubuntu-xenial:
             voting: false
+
+- project-template:
+    name: integrated-gate-py35
+    description: |
+      Run the python3 Tempest integration tests in check and gate for
+      repositories in the integrated gate.
+    check:
+      jobs:
+        - tempest-full-py3:
+            branches: ^(?!(stable/(newton|ocata|pike)|driverfixes)).*$
+    gate:
+      jobs:
+        - tempest-full-py3:
+            branches: ^(?!(stable/(newton|ocata|pike)|driverfixes)).*$

zuul.d/zuul-legacy-jobs.yaml

@@ -4791,20 +4791,6 @@
       - openstack/nova
       - openstack/tempest
 
-- job:
-    name: legacy-tempest-dsvm-py35
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-py35/run.yaml
-    post-run: playbooks/legacy/tempest-dsvm-py35/post.yaml
-    timeout: 10800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/tempest
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^releasenotes/.*$
-
 - job:
     name: legacy-tempest-dsvm-py35-full-devstack-plugin-ceph
     parent: legacy-dsvm-base

zuul.d/zuul-legacy-project-templates.yaml

@@ -116,17 +116,6 @@
             voting: false
             branches: ^(?!stable/(newton|ocata)).*$
 
-- project-template:
-    name: integrated-gate-py35
-    check:
-      jobs:
-        - legacy-tempest-dsvm-py35:
-            branches: ^(?!(stable|driverfixes))
-    gate:
-      jobs:
-        - legacy-tempest-dsvm-py35:
-            branches: ^(?!(stable|driverfixes))
-
 - project-template:
     name: lib-forward-testing
     check: