Merge "Remove Zun-client legacy jobs"

playbooks/legacy/zunclient-devstack-dsvm-docker-sql/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/zunclient-devstack-dsvm-docker-sql/run.yaml

@@ -1,75 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-zunclient-devstack-dsvm-docker-sql from old job gate-zunclient-devstack-dsvm-docker-sql
-  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]]
-          enable_plugin zun git://git.openstack.org/openstack/zun
-
-          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
-
-          # Enable tempest for tempest plugin
-          export ENABLED_SERVICES=tempest
-
-          export PROJECTS="openstack/zun $PROJECTS"
-          export PROJECTS="openstack/python-zunclient $PROJECTS"
-          export PROJECTS="openstack/kuryr-libnetwork $PROJECTS"
-          export PROJECTS="openstack/devstack-plugin-container $PROJECTS"
-
-          # Keep localrc to be able to set some vars in post_test_hook
-          export KEEP_LOCALRC=1
-
-          function gate_hook {
-               cd /opt/stack/new/zun/
-              ./zun/tests/contrib/gate_hook.sh docker sql
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              source $BASE/new/devstack/accrc/admin/admin
-              cd /opt/stack/new/python-zunclient/
-              ./zunclient/tests/functional/hooks/post_test_hook.sh docker
-          }
-          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 }}'

zuul.d/zuul-legacy-jobs.yaml

@@ -14389,20 +14389,6 @@
     post-run: playbooks/legacy/zun-ui-nodejs4-npm-run-test/post
     timeout: 2400
 
-- job:
-    name: legacy-zunclient-devstack-dsvm-docker-sql
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/zunclient-devstack-dsvm-docker-sql/run
-    post-run: playbooks/legacy/zunclient-devstack-dsvm-docker-sql/post
-    timeout: 4200
-    required-projects:
-      - openstack-dev/devstack
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-container
-      - openstack/kuryr-libnetwork
-      - openstack/python-zunclient
-      - openstack/zun
-
 - job:
     name: legacy-zuul-nodepool
     parent: legacy-base