From a4ed825cc69c76b55875adbbd4e2eab24d07a1e3 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Fri, 29 Jul 2022 15:07:23 +0200 Subject: [stable/train] Convert neutron-tempest-postgres-full to zuul v3 Similar to neutron-grenade, this legacy periodic job is now failing, timeout in setup steps [0] Switch it to tempest-integrated-networking (as was done in later branches) Also remove leftover playbooks from neutron-tempest-with-os-ken-master job (removed in stable branches) Related-Bug: #1982720 [0] https://zuul.openstack.org/builds?job_name=neutron-tempest-postgres-full&branch=stable%2Ftrain Change-Id: I8936df335dcddff5d7f8111815e2062a42e6bf6d --- .zuul.yaml | 20 ++++++-- .../legacy/neutron-tempest-postgres-full/post.yaml | 15 ------ .../legacy/neutron-tempest-postgres-full/run.yaml | 46 ------------------ .../neutron-tempest-with-os-ken-master/post.yaml | 15 ------ .../neutron-tempest-with-os-ken-master/run.yaml | 55 ---------------------- 5 files changed, 17 insertions(+), 134 deletions(-) delete mode 100644 playbooks/legacy/neutron-tempest-postgres-full/post.yaml delete mode 100644 playbooks/legacy/neutron-tempest-postgres-full/run.yaml delete mode 100644 playbooks/legacy/neutron-tempest-with-os-ken-master/post.yaml delete mode 100644 playbooks/legacy/neutron-tempest-with-os-ken-master/run.yaml diff --git a/.zuul.yaml b/.zuul.yaml index e3d857e9c9..4511a2bde8 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -532,14 +532,28 @@ - job: name: neutron-tempest-postgres-full - parent: legacy-dsvm-base - run: playbooks/legacy/neutron-tempest-postgres-full/run.yaml - post-run: playbooks/legacy/neutron-tempest-postgres-full/post.yaml + parent: tempest-integrated-networking timeout: 7800 required-projects: - openstack/devstack-gate - openstack/neutron - openstack/tempest + irrelevant-files: *tempest-irrelevant-files + vars: + devstack_services: + postgresql: true + mysql: false + # Cinder services + c-api: false + c-bak: false + c-sch: false + c-vol: false + cinder: false + # Swift services + s-account: false + s-container: false + s-object: false + s-proxy: false - job: name: neutron-fullstack-with-uwsgi diff --git a/playbooks/legacy/neutron-tempest-postgres-full/post.yaml b/playbooks/legacy/neutron-tempest-postgres-full/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/neutron-tempest-postgres-full/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/neutron-tempest-postgres-full/run.yaml b/playbooks/legacy/neutron-tempest-postgres-full/run.yaml deleted file mode 100644 index 89846b53c0..0000000000 --- a/playbooks/legacy/neutron-tempest-postgres-full/run.yaml +++ /dev/null @@ -1,46 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-periodic-tempest-dsvm-neutron-pg-full from old job - periodic-tempest-dsvm-neutron-pg-full-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 - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export DEVSTACK_GATE_POSTGRES=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_CONFIGDRIVE=0 - export DEVSTACK_GATE_TLSPROXY=1 - export BRANCH_OVERRIDE=master - 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 }}' diff --git a/playbooks/legacy/neutron-tempest-with-os-ken-master/post.yaml b/playbooks/legacy/neutron-tempest-with-os-ken-master/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/neutron-tempest-with-os-ken-master/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/neutron-tempest-with-os-ken-master/run.yaml b/playbooks/legacy/neutron-tempest-with-os-ken-master/run.yaml deleted file mode 100644 index da193ae071..0000000000 --- a/playbooks/legacy/neutron-tempest-with-os-ken-master/run.yaml +++ /dev/null @@ -1,55 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-periodic-tempest-dsvm-neutron-with-os-ken-master from - old job periodic-tempest-dsvm-neutron-with-ryu-master-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 - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TLSPROXY=1 - export BRANCH_OVERRIDE=master - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - function gate_hook { - local os_ken_path=$BASE/new/os_ken_master - if [ ! -d $os_ken_path ]; then - git clone https://github.com/openstack/os-ken.git $os_ken_path - fi - sudo pip install -e $os_ken_path - $BASE/new/devstack-gate/devstack-vm-gate.sh - } - 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 }}' -- cgit v1.2.1