summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Johnson <johnsomor@gmail.com>2023-04-19 15:29:42 +0000
committerMichael Johnson <johnsomor@gmail.com>2023-04-20 00:03:18 +0000
commit64b56187185a62780f79017a271d9962453bc442 (patch)
tree8302130417fb35438d5fbc1644ecc1e08c12dc9b
parentbdbbe6a396682f316304027845c818f94e6f4cd3 (diff)
downloaddesignate-64b56187185a62780f79017a271d9962453bc442.tar.gz
Update Ussuri grenade job to use zuulv3
Change-Id: I3fe5895eeee727f53d1c9202d4d0930963435aaa
-rw-r--r--.zuul.yaml43
-rw-r--r--playbooks/legacy/grenade-devstack-designate-pdns4/post.yaml15
-rw-r--r--playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml71
3 files changed, 34 insertions, 95 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 469f627f..1e4e0144 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -78,17 +78,42 @@
- job:
name: designate-grenade-pdns4
- parent: legacy-dsvm-base
+ parent: grenade
required-projects:
- - openstack/grenade
- - openstack/devstack-gate
- - openstack/designate
- - openstack/designate-dashboard
- - name: openstack/designate-tempest-plugin
+ - opendev.org/openstack/grenade
+ - opendev.org/openstack/designate
+ - name: opendev.org/openstack/designate-tempest-plugin
override-checkout: 0.8.0
- - openstack/python-designateclient
- run: playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml
- post-run: playbooks/legacy/grenade-devstack-designate-pdns4/post.yaml
+ - opendev.org/openstack/python-designateclient
+ vars:
+ grenade_devstack_localrc:
+ shared:
+ DESIGNATE_SERVICE_PORT_DNS: 5322
+ DESIGNATE_BACKEND_DRIVER: pdns4
+ devstack_plugins:
+ designate: https://opendev.org/openstack/designate.git
+ designate-tempest-plugin: https://opendev.org/openstack/designate-tempest-plugin.git
+ devstack_services:
+ s-account: false
+ s-container: false
+ s-object: false
+ s-proxy: false
+ c-api: false
+ c-bak: false
+ c-vol: false
+ cinder: false
+ designate: true
+ designate-api: true
+ designate-central: true
+ designate-producer: true
+ designate-mdns: true
+ designate-sink: true
+ designate-agent: true
+ designate-worker: true
+ tempest_plugins:
+ - designate-tempest-plugin
+ tempest_test_regex: ^designate_tempest_plugin.*\[.*\bsmoke\b.*\]
+ tox_envlist: all
timeout: 10800
irrelevant-files:
- ^.*\.rst$
diff --git a/playbooks/legacy/grenade-devstack-designate-pdns4/post.yaml b/playbooks/legacy/grenade-devstack-designate-pdns4/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/grenade-devstack-designate-pdns4/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/grenade-devstack-designate-pdns4/run.yaml b/playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml
deleted file mode 100644
index 7d10569f..00000000
--- a/playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-grenade-dsvm-designate-pdns4 from old job gate-grenade-dsvm-designate-pdns4-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/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
- cat << 'EOF' >>"/tmp/dg-local.conf"
- [[local|localrc]]
- DESIGNATE_SERVICE_PORT_DNS=5322
- DESIGNATE_BACKEND_DRIVER=pdns4
- TEMPEST_PLUGINS=' ../designate-tempest-plugin'
-
- 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_USE_PYTHON3=True
- export DEVSTACK_GATE_TEMPEST=1
- export DEVSTACK_GATE_GRENADE=pullup
- export DEVSTACK_GATE_TEMPEST_REGEX="designate_tempest_plugin(?!\.tests.api.v1).*"
- export DEVSTACK_GATE_HORIZON=1
- export DEVSTACK_GATE_USE_PYTHON3=True
-
- export PROJECTS="openstack/designate $PROJECTS"
- export PROJECTS="openstack/python-designateclient $PROJECTS"
- export PROJECTS="openstack/designate-dashboard $PROJECTS"
- export PROJECTS="openstack/designate-tempest-plugin $PROJECTS"
- export PROJECTS="openstack/grenade $PROJECTS"
-
- export BRANCH_OVERRIDE=default
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
-
- export GRENADE_PLUGINRC="enable_grenade_plugin designate https://opendev.org/openstack/designate"
-
- 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 }}'