From 3ab8ec971c413f9da79bc1d103d3900da54c461b Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Thu, 12 Dec 2019 13:27:19 +0000 Subject: Move cinder grenade job to py3 and in cinder repo below grenade jobs for cinder are present in opensatck-zuul-jobs repo. These needs to run on py3 from Ussuri onwards and py2 for stable/branch. py2 version has been kept in opensatck-zuul-jobs and for ussuri onwwards these has been migrated to cinder repo with py3 version. - legacy-grenade-dsvm-cinder-mn-sub-bak - legacy-grenade-dsvm-cinder-mn-sub-volbak - legacy-grenade-dsvm-cinder-mn-sub-volschbak Change-Id: I67d2504dd80214e615a45f605b0023ca6919fb73 --- .../grenade-dsvm-cinder-mn-sub-bak/post.yaml | 15 ++++++ .../legacy/grenade-dsvm-cinder-mn-sub-bak/run.yaml | 53 +++++++++++++++++++++ .../grenade-dsvm-cinder-mn-sub-volbak/post.yaml | 15 ++++++ .../grenade-dsvm-cinder-mn-sub-volbak/run.yaml | 53 +++++++++++++++++++++ .../grenade-dsvm-cinder-mn-sub-volschbak/post.yaml | 15 ++++++ .../grenade-dsvm-cinder-mn-sub-volschbak/run.yaml | 54 ++++++++++++++++++++++ 6 files changed, 205 insertions(+) create mode 100644 playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/post.yaml create mode 100644 playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/run.yaml create mode 100644 playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/post.yaml create mode 100644 playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/run.yaml create mode 100644 playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/post.yaml create mode 100644 playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/run.yaml (limited to 'playbooks') diff --git a/playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/post.yaml b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/post.yaml new file mode 100644 index 000000000..e07f5510a --- /dev/null +++ b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/post.yaml @@ -0,0 +1,15 @@ +- 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-dsvm-cinder-mn-sub-bak/run.yaml b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/run.yaml new file mode 100644 index 000000000..f8ba33b1b --- /dev/null +++ b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/run.yaml @@ -0,0 +1,53 @@ +- hosts: primary + name: Autoconverted job legacy-grenade-dsvm-cinder-mn-sub-bak from old job gate-grenade-dsvm-cinder-mn-sub-bak-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_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" + export SERVICES=bak + if [ "$SERVICES" == "bak" ] ; then + export DEVSTACK_GATE_CINDER_MN_GRENADE_SUB_BAK=1 + elif [ "$SERVICES" == "volschbak" ] ; then + export DEVSTACK_GATE_CINDER_MN_GRENADE_SUB_VOLSCHBAK=1 + else + export DEVSTACK_GATE_CINDER_MN_GRENADE=1 + 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/grenade-dsvm-cinder-mn-sub-volbak/post.yaml b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/post.yaml new file mode 100644 index 000000000..e07f5510a --- /dev/null +++ b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/post.yaml @@ -0,0 +1,15 @@ +- 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-dsvm-cinder-mn-sub-volbak/run.yaml b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/run.yaml new file mode 100644 index 000000000..b06abba60 --- /dev/null +++ b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/run.yaml @@ -0,0 +1,53 @@ +- hosts: primary + name: Autoconverted job legacy-grenade-dsvm-cinder-mn-sub-volbak from old job gate-grenade-dsvm-cinder-mn-sub-volbak-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_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" + export SERVICES=volbak + if [ "$SERVICES" == "bak" ] ; then + export DEVSTACK_GATE_CINDER_MN_GRENADE_SUB_BAK=1 + elif [ "$SERVICES" == "volschbak" ] ; then + export DEVSTACK_GATE_CINDER_MN_GRENADE_SUB_VOLSCHBAK=1 + else + export DEVSTACK_GATE_CINDER_MN_GRENADE=1 + 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/grenade-dsvm-cinder-mn-sub-volschbak/post.yaml b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/post.yaml new file mode 100644 index 000000000..e07f5510a --- /dev/null +++ b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/post.yaml @@ -0,0 +1,15 @@ +- 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-dsvm-cinder-mn-sub-volschbak/run.yaml b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/run.yaml new file mode 100644 index 000000000..476fef85f --- /dev/null +++ b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/run.yaml @@ -0,0 +1,54 @@ +- hosts: primary + name: Autoconverted job legacy-grenade-dsvm-cinder-mn-sub-volschbak from old job + gate-grenade-dsvm-cinder-mn-sub-volschbak-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_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" + export SERVICES=volschbak + if [ "$SERVICES" == "bak" ] ; then + export DEVSTACK_GATE_CINDER_MN_GRENADE_SUB_BAK=1 + elif [ "$SERVICES" == "volschbak" ] ; then + export DEVSTACK_GATE_CINDER_MN_GRENADE_SUB_VOLSCHBAK=1 + else + export DEVSTACK_GATE_CINDER_MN_GRENADE=1 + 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 }}' -- cgit v1.2.1