Browse Source

Merge "Use grenade-multinode instead of the custom legacy job"

changes/01/738101/3
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
097443424f
3 changed files with 1 additions and 73 deletions
  1. +1
    -12
      .zuul.yaml
  2. +0
    -15
      playbooks/legacy/glance-dsvm-grenade-multinode/post.yaml
  3. +0
    -46
      playbooks/legacy/glance-dsvm-grenade-multinode/run.yaml

+ 1
- 12
.zuul.yaml View File

@@ -1,14 +1,3 @@
- job:
name: glance-dsvm-grenade-multinode
parent: legacy-dsvm-base-multinode
run: playbooks/legacy/glance-dsvm-grenade-multinode/run.yaml
post-run: playbooks/legacy/glance-dsvm-grenade-multinode/post.yaml
timeout: 10800
required-projects:
- openstack/grenade
- openstack/devstack-gate
- openstack/glance

- job:
name: glance-code-constants-check
parent: tox
@@ -272,7 +261,7 @@
- glance-tox-functional-py38-glance_store-tips
- glance-tox-functional-py36-glance_store-tips
- barbican-simple-crypto-devstack-tempest
- glance-dsvm-grenade-multinode
- grenade-multinode
- tempest-pg-full:
irrelevant-files: *tempest-irrelevant-files
- tempest-full-py3-opensuse15:


+ 0
- 15
playbooks/legacy/glance-dsvm-grenade-multinode/post.yaml View File

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

+ 0
- 46
playbooks/legacy/glance-dsvm-grenade-multinode/run.yaml View File

@@ -1,46 +0,0 @@
- hosts: primary
name: Autoconverted job legacy-glance-dsvm-grenade-multinode from old job gate-glance-dsvm-grenade-multinode-ubuntu-xenial-nv
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_NEUTRON=1
export DEVSTACK_GATE_CONFIGDRIVE=0
export DEVSTACK_GATE_GRENADE=pullup
export DEVSTACK_GATE_USE_PYTHON3=True
export PROJECTS="openstack/grenade $PROJECTS"
export BRANCH_OVERRIDE=default
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export DEVSTACK_GATE_TOPOLOGY="multinode"

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 }}'

Loading…
Cancel
Save