From 92077917425273ebe41959f023d4be37f4957f66 Mon Sep 17 00:00:00 2001 From: zhurong Date: Fri, 17 Nov 2017 14:59:41 +0800 Subject: [PATCH] Remove Solum legacy job Depends-On: I4ae552cb216d49a20fb3409117d09660f9ac2fce Change-Id: I6c46eaa17e1ff27c63e9b95548c67c073e697781 --- .../solum-devstack-dsvm-centos-7/post.yaml | 15 ---- .../solum-devstack-dsvm-centos-7/run.yaml | 83 ------------------ .../legacy/solum-devstack-dsvm-py35/post.yaml | 15 ---- .../legacy/solum-devstack-dsvm-py35/run.yaml | 84 ------------------ .../post.yaml | 15 ---- .../run.yaml | 85 ------------------- .../legacy/solum-devstack-dsvm/post.yaml | 15 ---- playbooks/legacy/solum-devstack-dsvm/run.yaml | 83 ------------------ zuul.d/zuul-legacy-jobs.yaml | 79 ----------------- 9 files changed, 474 deletions(-) delete mode 100644 playbooks/legacy/solum-devstack-dsvm-centos-7/post.yaml delete mode 100644 playbooks/legacy/solum-devstack-dsvm-centos-7/run.yaml delete mode 100644 playbooks/legacy/solum-devstack-dsvm-py35/post.yaml delete mode 100644 playbooks/legacy/solum-devstack-dsvm-py35/run.yaml delete mode 100644 playbooks/legacy/solum-devstack-dsvm-seperate-test/post.yaml delete mode 100644 playbooks/legacy/solum-devstack-dsvm-seperate-test/run.yaml delete mode 100644 playbooks/legacy/solum-devstack-dsvm/post.yaml delete mode 100644 playbooks/legacy/solum-devstack-dsvm/run.yaml diff --git a/playbooks/legacy/solum-devstack-dsvm-centos-7/post.yaml b/playbooks/legacy/solum-devstack-dsvm-centos-7/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/solum-devstack-dsvm-centos-7/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/solum-devstack-dsvm-centos-7/run.yaml b/playbooks/legacy/solum-devstack-dsvm-centos-7/run.yaml deleted file mode 100644 index c83f13c6..00000000 --- a/playbooks/legacy/solum-devstack-dsvm-centos-7/run.yaml +++ /dev/null @@ -1,83 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-solum-devstack-dsvm-centos-7 from old job gate-solum-devstack-dsvm-centos-7-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-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/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]] - enable_plugin solum git://git.openstack.org/openstack/solum - SOLUM_PROJ_DIR=/opt/stack/new/solum - enable_plugin zun git://git.openstack.org/openstack/zun - enable_plugin devstack-plugin-container git://git.openstack.org/openstack/devstack-plugin-container - - 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_NEUTRON=1 - export ENABLED_SERVICES=solum,solum-api,solum-conductor,solum-deployer,solum-worker,tempest,zaqar,barbican,mistral - export PROJECTS="openstack/solum $PROJECTS" - export PROJECTS="openstack/solum-dashboard $PROJECTS" - export PROJECTS="openstack/python-solumclient $PROJECTS" - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/mistral $PROJECTS" - export PROJECTS="openstack/zun $PROJECTS" - export PROJECTS="openstack/devstack-plugin-container $PROJECTS" - export PROJECTS="openstack/python-zunclient $PROJECTS" - export PROJECTS="openstack/zun-tempest-plugin $PROJECTS" - - export KEEP_LOCALRC=1 - - function pre_test_hook { - cd /opt/stack/new/solum/functionaltests - ./pre_test_hook.sh - } - export -f pre_test_hook - - function gate_hook { - cd /opt/stack/new/solum/functionaltests - ./gate_hook.sh - } - export -f gate_hook - - function post_test_hook { - cd /opt/stack/new/solum/functionaltests - ./post_test_hook.sh - } - export -f post_test_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 }}' diff --git a/playbooks/legacy/solum-devstack-dsvm-py35/post.yaml b/playbooks/legacy/solum-devstack-dsvm-py35/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/solum-devstack-dsvm-py35/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/solum-devstack-dsvm-py35/run.yaml b/playbooks/legacy/solum-devstack-dsvm-py35/run.yaml deleted file mode 100644 index f4af4a2f..00000000 --- a/playbooks/legacy/solum-devstack-dsvm-py35/run.yaml +++ /dev/null @@ -1,84 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-solum-devstack-dsvm-py35 from old job gate-solum-devstack-dsvm-py35-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-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/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]] - enable_plugin solum git://git.openstack.org/openstack/solum - SOLUM_PROJ_DIR=/opt/stack/new/solum - enable_plugin zun git://git.openstack.org/openstack/zun - enable_plugin devstack-plugin-container git://git.openstack.org/openstack/devstack-plugin-container - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export DEVSTACK_GATE_USE_PYTHON3=True - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export ENABLED_SERVICES=solum,solum-api,solum-conductor,solum-deployer,solum-worker,tempest,zaqar,barbican,mistral - export PROJECTS="openstack/solum $PROJECTS" - export PROJECTS="openstack/solum-dashboard $PROJECTS" - export PROJECTS="openstack/python-solumclient $PROJECTS" - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/mistral $PROJECTS" - export PROJECTS="openstack/zun $PROJECTS" - export PROJECTS="openstack/devstack-plugin-container $PROJECTS" - export PROJECTS="openstack/python-zunclient $PROJECTS" - export PROJECTS="openstack/zun-tempest-plugin $PROJECTS" - - export KEEP_LOCALRC=1 - - function pre_test_hook { - cd /opt/stack/new/solum/functionaltests - ./pre_test_hook.sh - } - export -f pre_test_hook - - function gate_hook { - cd /opt/stack/new/solum/functionaltests - ./gate_hook.sh - } - export -f gate_hook - - function post_test_hook { - cd /opt/stack/new/solum/functionaltests - ./post_test_hook.sh - } - export -f post_test_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 }}' diff --git a/playbooks/legacy/solum-devstack-dsvm-seperate-test/post.yaml b/playbooks/legacy/solum-devstack-dsvm-seperate-test/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/solum-devstack-dsvm-seperate-test/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/solum-devstack-dsvm-seperate-test/run.yaml b/playbooks/legacy/solum-devstack-dsvm-seperate-test/run.yaml deleted file mode 100644 index 77826ee8..00000000 --- a/playbooks/legacy/solum-devstack-dsvm-seperate-test/run.yaml +++ /dev/null @@ -1,85 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-solum-devstack-dsvm-seperate-test from old job gate-solum-devstack-dsvm-seperate-test-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-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/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]] - TEMPEST_PLUGINS='/opt/stack/new/solum-tempest-plugin' - enable_plugin solum git://git.openstack.org/openstack/solum - SOLUM_PROJ_DIR=/opt/stack/new/solum - enable_plugin zun git://git.openstack.org/openstack/zun - enable_plugin devstack-plugin-container git://git.openstack.org/openstack/devstack-plugin-container - - 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_NEUTRON=1 - export ENABLED_SERVICES=solum,solum-api,solum-conductor,solum-deployer,solum-worker,tempest,zaqar,barbican,mistral - export PROJECTS="openstack/solum $PROJECTS" - export PROJECTS="openstack/solum-dashboard $PROJECTS" - export PROJECTS="openstack/python-solumclient $PROJECTS" - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/mistral $PROJECTS" - export PROJECTS="openstack/zun $PROJECTS" - export PROJECTS="openstack/devstack-plugin-container $PROJECTS" - export PROJECTS="openstack/python-zunclient $PROJECTS" - export PROJECTS="openstack/solum-tempest-plugin $PROJECTS" - export PROJECTS="openstack/zun-tempest-plugin $PROJECTS" - - export KEEP_LOCALRC=1 - - function pre_test_hook { - cd /opt/stack/new/solum/functionaltests - ./pre_test_hook.sh - } - export -f pre_test_hook - - function gate_hook { - cd /opt/stack/new/solum/functionaltests - ./gate_hook.sh - } - export -f gate_hook - - function post_test_hook { - cd /opt/stack/new/solum/functionaltests - ./post_test_hook_split.sh - } - export -f post_test_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 }}' diff --git a/playbooks/legacy/solum-devstack-dsvm/post.yaml b/playbooks/legacy/solum-devstack-dsvm/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/solum-devstack-dsvm/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/solum-devstack-dsvm/run.yaml b/playbooks/legacy/solum-devstack-dsvm/run.yaml deleted file mode 100644 index 76c24352..00000000 --- a/playbooks/legacy/solum-devstack-dsvm/run.yaml +++ /dev/null @@ -1,83 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-solum-devstack-dsvm from old job gate-solum-devstack-dsvm-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-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/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]] - enable_plugin solum git://git.openstack.org/openstack/solum - SOLUM_PROJ_DIR=/opt/stack/new/solum - enable_plugin zun git://git.openstack.org/openstack/zun - enable_plugin devstack-plugin-container git://git.openstack.org/openstack/devstack-plugin-container - - 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_NEUTRON=1 - export ENABLED_SERVICES=solum,solum-api,solum-conductor,solum-deployer,solum-worker,tempest,zaqar,barbican,mistral - export PROJECTS="openstack/solum $PROJECTS" - export PROJECTS="openstack/solum-dashboard $PROJECTS" - export PROJECTS="openstack/python-solumclient $PROJECTS" - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/mistral $PROJECTS" - export PROJECTS="openstack/zun $PROJECTS" - export PROJECTS="openstack/devstack-plugin-container $PROJECTS" - export PROJECTS="openstack/python-zunclient $PROJECTS" - export PROJECTS="openstack/zun-tempest-plugin $PROJECTS" - - export KEEP_LOCALRC=1 - - function pre_test_hook { - cd /opt/stack/new/solum/functionaltests - ./pre_test_hook.sh - } - export -f pre_test_hook - - function gate_hook { - cd /opt/stack/new/solum/functionaltests - ./gate_hook.sh - } - export -f gate_hook - - function post_test_hook { - cd /opt/stack/new/solum/functionaltests - ./post_test_hook.sh - } - export -f post_test_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 }}' diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index dabcc302..d88c4cdb 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -5536,85 +5536,6 @@ post-run: playbooks/legacy/service-types-authority-validate/post.yaml timeout: 2400 - -- job: - name: legacy-solum-devstack-dsvm - parent: legacy-dsvm-base - run: playbooks/legacy/solum-devstack-dsvm/run.yaml - post-run: playbooks/legacy/solum-devstack-dsvm/post.yaml - timeout: 4200 - required-projects: - - openstack-dev/devstack - - openstack-infra/devstack-gate - - openstack/barbican - - openstack/devstack-plugin-container - - openstack/mistral - - openstack/python-solumclient - - openstack/python-zunclient - - openstack/solum - - openstack/solum-dashboard - - openstack/zun - - openstack/zun-tempest-plugin - -- job: - name: legacy-solum-devstack-dsvm-centos-7 - parent: legacy-dsvm-base - run: playbooks/legacy/solum-devstack-dsvm-centos-7/run.yaml - post-run: playbooks/legacy/solum-devstack-dsvm-centos-7/post.yaml - timeout: 4200 - nodeset: legacy-centos-7 - required-projects: - - openstack-dev/devstack - - openstack-infra/devstack-gate - - openstack/barbican - - openstack/devstack-plugin-container - - openstack/mistral - - openstack/python-solumclient - - openstack/python-zunclient - - openstack/solum - - openstack/solum-dashboard - - openstack/zun - - openstack/zun-tempest-plugin - -- job: - name: legacy-solum-devstack-dsvm-py35 - parent: legacy-dsvm-base - run: playbooks/legacy/solum-devstack-dsvm-py35/run.yaml - post-run: playbooks/legacy/solum-devstack-dsvm-py35/post.yaml - timeout: 4200 - required-projects: - - openstack-dev/devstack - - openstack-infra/devstack-gate - - openstack/barbican - - openstack/devstack-plugin-container - - openstack/mistral - - openstack/python-solumclient - - openstack/python-zunclient - - openstack/solum - - openstack/solum-dashboard - - openstack/zun - - openstack/zun-tempest-plugin - -- job: - name: legacy-solum-devstack-dsvm-seperate-test - parent: legacy-dsvm-base - run: playbooks/legacy/solum-devstack-dsvm-seperate-test/run.yaml - post-run: playbooks/legacy/solum-devstack-dsvm-seperate-test/post.yaml - timeout: 4200 - required-projects: - - openstack-dev/devstack - - openstack-infra/devstack-gate - - openstack/barbican - - openstack/devstack-plugin-container - - openstack/mistral - - openstack/python-solumclient - - openstack/python-zunclient - - openstack/solum - - openstack/solum-dashboard - - openstack/solum-tempest-plugin - - openstack/zun - - openstack/zun-tempest-plugin - - job: name: legacy-sqlalchemy-migrate-devstack-dsvm parent: legacy-dsvm-base