From bc2a23a36a6051aed66f36b9ea86df5fa0dc4319 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Sun, 3 May 2020 09:44:06 +0200 Subject: Migrate neutron grenade jobs to be native Zuul v3 This commit migrates neutron-grenade multinode jobs. OVN job will be switched later. Change-Id: Ibe613a48116aed9cbcc7c689a50c1ef9fba60f05 --- .../legacy/neutron-grenade-dvr-multinode/post.yaml | 15 ------ .../legacy/neutron-grenade-dvr-multinode/run.yaml | 60 ---------------------- .../legacy/neutron-grenade-multinode/post.yaml | 15 ------ .../legacy/neutron-grenade-multinode/run.yaml | 60 ---------------------- 4 files changed, 150 deletions(-) delete mode 100644 playbooks/legacy/neutron-grenade-dvr-multinode/post.yaml delete mode 100644 playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml delete mode 100644 playbooks/legacy/neutron-grenade-multinode/post.yaml delete mode 100644 playbooks/legacy/neutron-grenade-multinode/run.yaml (limited to 'playbooks') diff --git a/playbooks/legacy/neutron-grenade-dvr-multinode/post.yaml b/playbooks/legacy/neutron-grenade-dvr-multinode/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/neutron-grenade-dvr-multinode/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-grenade-dvr-multinode/run.yaml b/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml deleted file mode 100644 index 9e96b297f1..0000000000 --- a/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml +++ /dev/null @@ -1,60 +0,0 @@ -- hosts: primary - name: Autoconverted job legacy-grenade-dsvm-neutron-dvr-multinode from old job gate-grenade-dsvm-neutron-dvr-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 - # Test DVR upgrade on multinode - export PROJECTS="openstack/grenade $PROJECTS" - export DEVSTACK_GATE_NEUTRON_DVR=1 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export DEVSTACK_GATE_TOPOLOGY="multinode" - - # Disable some services to use less memory - # Cinder-backup - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-bak" - # Etcd - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service etcd3" - # Swift - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container-sync" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-object" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-proxy" - - 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-grenade-multinode/post.yaml b/playbooks/legacy/neutron-grenade-multinode/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/neutron-grenade-multinode/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-grenade-multinode/run.yaml b/playbooks/legacy/neutron-grenade-multinode/run.yaml deleted file mode 100644 index c30bfecf80..0000000000 --- a/playbooks/legacy/neutron-grenade-multinode/run.yaml +++ /dev/null @@ -1,60 +0,0 @@ -- hosts: primary - name: Autoconverted job legacy-grenade-dsvm-neutron-multinode from old job gate-grenade-dsvm-neutron-multinode-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_NEUTRON=1 - export DEVSTACK_GATE_CONFIGDRIVE=0 - export DEVSTACK_GATE_GRENADE=pullup - export DEVSTACK_GATE_USE_PYTHON3=True - export PROJECTS="openstack/grenade $PROJECTS" - # Default to non DVR - export DEVSTACK_GATE_NEUTRON_DVR=0 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export DEVSTACK_GATE_TOPOLOGY="multinode" - - # Disable some services to use less memory - # Cinder - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-bak" - # Etcd - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service etcd3" - # Swift - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container-sync" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-object" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-proxy" - - 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