From 1ae1a3bd5032bd8720fbe737503c552ba061572c Mon Sep 17 00:00:00 2001
From: Pavlo Shchelokovskyy <shchelokovskyy@gmail.com>
Date: Thu, 19 Oct 2017 13:50:58 +0300
Subject: [PATCH] Remove networking-generic-switch job
this job definition has been moved in n-g-s tree.
Depends-On: I2c0fc94989d89a553aa8f8771ae23a5cffab515c
Change-Id: I8ee918ffd50f88cb207abb7ccf45feadc10707ff
---
.../post.yaml | 15 ----
.../run.yaml | 70 -------------------
zuul.d/zuul-legacy-jobs.yaml | 11 ---
3 files changed, 96 deletions(-)
delete mode 100644 playbooks/legacy/networking-generic-switch-dsvm-tempest/post.yaml
delete mode 100644 playbooks/legacy/networking-generic-switch-dsvm-tempest/run.yaml
diff --git a/playbooks/legacy/networking-generic-switch-dsvm-tempest/post.yaml b/playbooks/legacy/networking-generic-switch-dsvm-tempest/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/networking-generic-switch-dsvm-tempest/post.yaml
+++ /dev/null
@@ -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
diff --git a/playbooks/legacy/networking-generic-switch-dsvm-tempest/run.yaml b/playbooks/legacy/networking-generic-switch-dsvm-tempest/run.yaml
deleted file mode 100644
index 636c80b5..00000000
--- a/playbooks/legacy/networking-generic-switch-dsvm-tempest/run.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-networking-generic-switch-dsvm-tempest from old job
- gate-networking-generic-switch-dsvm-tempest
- 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 networking-generic-switch git://git.openstack.org/openstack/networking-generic-switch
- OVS_PHYSICAL_BRIDGE=brbm
- PHYSICAL_NETWORK=mynetwork
- Q_PLUGIN=ml2
- ENABLE_TENANT_VLANS=True
- Q_ML2_TENANT_NETWORK_TYPE=vlan
- TENANT_VLAN_RANGE=100:150
- # test with DLM support enabled
- GENERIC_SWITCH_USER_MAX_SESSIONS=2
-
- 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=1
- export DEVSTACK_GATE_NEUTRON=1
- export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
- export DEVSTACK_GATE_TEMPEST_REGEX='ngs'
- export BRANCH_OVERRIDE=default
- export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,q-svc,q-agt,q-dhcp,q-l3,tempest,etcd3
- export DEVSTACK_GATE_REMOVE_STACK_SUDO=0
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
-
- export PROJECTS="openstack/networking-generic-switch $PROJECTS"
-
- 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 }}'
diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml
index 750b4b3e..a78a5866 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -4728,17 +4728,6 @@
required-projects:
- openstack/requirements
-- job:
- name: legacy-networking-generic-switch-dsvm-tempest
- parent: legacy-dsvm-base
- run: playbooks/legacy/networking-generic-switch-dsvm-tempest/run
- post-run: playbooks/legacy/networking-generic-switch-dsvm-tempest/post
- timeout: 4800
- required-projects:
- - openstack-infra/devstack-gate
- - openstack/networking-generic-switch
- - openstack/tempest
-
- job:
name: legacy-networking-l2gw-dsvm-functional
parent: legacy-dsvm-base