From 408f2d341070ec692a32aaf60f2f9ee3f976d900 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Wed, 21 Feb 2018 17:49:42 +0100 Subject: [PATCH] Remove now unused jobs from various sahara repositories Most of jobs from sahara, sahara-tests, python-saharaclient have been migrated. Keep the ones still not ported (grenade) or not working (multinode) as Zuul v3. The native jobs works on stable/pike, stable/queens and master. Ocata is going out of support in few days and a last release for Sahara was tagged few days ago. Depends-On: https://review.openstack.org/546695 Change-Id: I72e9e6ea9d612a40085635544215f89d9b75053e --- .../run.yaml | 54 --------- .../run.yaml | 55 --------- playbooks/legacy/sahara-cli/post.yaml | 80 ------------- playbooks/legacy/sahara-cli/run.yaml | 68 ----------- .../sahara-dsvm-scenario-mod-wsgi/post.yaml | 15 --- .../sahara-dsvm-scenario-mod-wsgi/run.yaml | 80 ------------- .../sahara-dsvm-scenario-neutron/post.yaml | 15 --- .../sahara-dsvm-scenario-neutron/run.yaml | 80 ------------- .../legacy/sahara-dsvm-scenario-py3/post.yaml | 15 --- .../legacy/sahara-dsvm-scenario-py3/run.yaml | 80 ------------- .../post.yaml | 15 --- .../run.yaml | 61 ---------- .../legacy/tempest-dsvm-sahara/post.yaml | 15 --- playbooks/legacy/tempest-dsvm-sahara/run.yaml | 71 ------------ zuul.d/zuul-legacy-jobs.yaml | 107 ------------------ 15 files changed, 811 deletions(-) delete mode 100644 playbooks/legacy/sahara-buildimages-ambari-centos-7/run.yaml delete mode 100644 playbooks/legacy/sahara-buildimages-cloudera-centos-7/run.yaml delete mode 100644 playbooks/legacy/sahara-cli/post.yaml delete mode 100644 playbooks/legacy/sahara-cli/run.yaml delete mode 100644 playbooks/legacy/sahara-dsvm-scenario-mod-wsgi/post.yaml delete mode 100644 playbooks/legacy/sahara-dsvm-scenario-mod-wsgi/run.yaml delete mode 100644 playbooks/legacy/sahara-dsvm-scenario-neutron/post.yaml delete mode 100644 playbooks/legacy/sahara-dsvm-scenario-neutron/run.yaml delete mode 100644 playbooks/legacy/sahara-dsvm-scenario-py3/post.yaml delete mode 100644 playbooks/legacy/sahara-dsvm-scenario-py3/run.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-neutron-src-python-saharaclient/post.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-neutron-src-python-saharaclient/run.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-sahara/post.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-sahara/run.yaml diff --git a/playbooks/legacy/sahara-buildimages-ambari-centos-7/run.yaml b/playbooks/legacy/sahara-buildimages-ambari-centos-7/run.yaml deleted file mode 100644 index 018774df..00000000 --- a/playbooks/legacy/sahara-buildimages-ambari-centos-7/run.yaml +++ /dev/null @@ -1,54 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-sahara-buildimages-ambari-centos-7 from old job gate-sahara-buildimages-ambari-centos-7-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - # In cases where zuul-cloner is aborted during a git - # clone operation, git will remove the git work tree in - # its cleanup. The work tree in these jobs is the - # workspace directory, which means that subsequent - # jenkins post-build actions can not run because the - # workspace has been removed. - # To reduce the likelihood of this having an impact, - # recreate the workspace directory if needed - mkdir -p $WORKSPACE - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - sudo mkdir -p /opt/sahara-image-build - sudo chown $(whoami) /opt/sahara-image-build - export DEST=/opt/sahara-image-build - ./tools/gate/build-images ambari - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/sahara-buildimages-cloudera-centos-7/run.yaml b/playbooks/legacy/sahara-buildimages-cloudera-centos-7/run.yaml deleted file mode 100644 index e9517f26..00000000 --- a/playbooks/legacy/sahara-buildimages-cloudera-centos-7/run.yaml +++ /dev/null @@ -1,55 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-sahara-buildimages-cloudera-centos-7 from old job - gate-sahara-buildimages-cloudera-centos-7-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - # In cases where zuul-cloner is aborted during a git - # clone operation, git will remove the git work tree in - # its cleanup. The work tree in these jobs is the - # workspace directory, which means that subsequent - # jenkins post-build actions can not run because the - # workspace has been removed. - # To reduce the likelihood of this having an impact, - # recreate the workspace directory if needed - mkdir -p $WORKSPACE - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - sudo mkdir -p /opt/sahara-image-build - sudo chown $(whoami) /opt/sahara-image-build - export DEST=/opt/sahara-image-build - ./tools/gate/build-images cloudera - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/sahara-cli/post.yaml b/playbooks/legacy/sahara-cli/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/sahara-cli/post.yaml +++ /dev/null @@ -1,80 +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=**/*nose_results.html - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=**/*testr_results.html.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=/.testrepository/tmp* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=**/*testrepository.subunit.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}/tox' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.tox/*/log/* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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/sahara-cli/run.yaml b/playbooks/legacy/sahara-cli/run.yaml deleted file mode 100644 index dd7efce8..00000000 --- a/playbooks/legacy/sahara-cli/run.yaml +++ /dev/null @@ -1,68 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-sahara-cli from old job gate-sahara-cli-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 sahara git://git.openstack.org/openstack/sahara - enable_plugin heat git://git.openstack.org/openstack/heat - TEMPEST_PLUGINS='/opt/stack/new/sahara-tests' - - 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 DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_REGEX="sahara_tempest_plugin.tests.cli" - export KEEP_LOCALRC=1 - export PROJECTS="openstack/sahara $PROJECTS" - export PROJECTS="openstack/sahara-tests $PROJECTS" - - if [ "$ZUUL_PROJECT" = "openstack/python-saharaclient" ]; then - export DEVSTACK_PROJECT_FROM_GIT=python-saharaclient - fi - - function pre_test_hook { - cd /opt/stack/new/sahara-tests/tools/gate/cli_tests - ./pre_test_hook.sh - } - - export -f pre_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/sahara-dsvm-scenario-mod-wsgi/post.yaml b/playbooks/legacy/sahara-dsvm-scenario-mod-wsgi/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/sahara-dsvm-scenario-mod-wsgi/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/sahara-dsvm-scenario-mod-wsgi/run.yaml b/playbooks/legacy/sahara-dsvm-scenario-mod-wsgi/run.yaml deleted file mode 100644 index 7ca641e3..00000000 --- a/playbooks/legacy/sahara-dsvm-scenario-mod-wsgi/run.yaml +++ /dev/null @@ -1,80 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-sahara-dsvm-scenario-mod-wsgi from old job gate-sahara-dsvm-scenario-mod-wsgi-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 - export PYTHONUNBUFFERED=true - export DEVSTACK_SUBNODE_CONFIG=" " - export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export KEEP_LOCALRC=1 - export PROJECTS="openstack/sahara $PROJECTS" - export PROJECTS="openstack/sahara-tests $PROJECTS" - export PROJECTS="openstack/sahara-image-elements openstack/sahara-extra $PROJECTS" - if [ "neutron" == "nova" ] ; then - export DEVSTACK_GATE_NEUTRON=0 - else - export DEVSTACK_GATE_NEUTRON=1 - fi - if [ "$ZUUL_PROJECT" = "openstack/python-saharaclient" ]; then - export DEVSTACK_PROJECT_FROM_GIT=python-saharaclient - fi - if [ "0" -eq 1 ] ; then - export DEVSTACK_GATE_TOPOLOGY="multinode" - fi - if [ "1" -eq 1 ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"SAHARA_USE_MOD_WSGI=True" - fi - if [ "0" -eq 1 ] ; then - export DEVSTACK_GATE_USE_PYTHON3=True - fi - export BRANCH_OVERRIDE=default - if [ "default" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - function pre_test_hook { - cd /opt/stack/new/sahara-tests/tools/gate/scenario - ./pre_test_hook.sh neutron fake - } - export -f pre_test_hook - - function post_test_hook { - cd /opt/stack/new/sahara-tests/tools/gate/scenario - ./post_test_hook.sh neutron fake - } - 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/sahara-dsvm-scenario-neutron/post.yaml b/playbooks/legacy/sahara-dsvm-scenario-neutron/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/sahara-dsvm-scenario-neutron/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/sahara-dsvm-scenario-neutron/run.yaml b/playbooks/legacy/sahara-dsvm-scenario-neutron/run.yaml deleted file mode 100644 index fd358a0e..00000000 --- a/playbooks/legacy/sahara-dsvm-scenario-neutron/run.yaml +++ /dev/null @@ -1,80 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-sahara-dsvm-scenario-neutron from old job gate-sahara-dsvm-scenario-neutron-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 - export PYTHONUNBUFFERED=true - export DEVSTACK_SUBNODE_CONFIG=" " - export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export KEEP_LOCALRC=1 - export PROJECTS="openstack/sahara $PROJECTS" - export PROJECTS="openstack/sahara-tests $PROJECTS" - export PROJECTS="openstack/sahara-image-elements openstack/sahara-extra $PROJECTS" - if [ "neutron" == "nova" ] ; then - export DEVSTACK_GATE_NEUTRON=0 - else - export DEVSTACK_GATE_NEUTRON=1 - fi - if [ "$ZUUL_PROJECT" = "openstack/python-saharaclient" ]; then - export DEVSTACK_PROJECT_FROM_GIT=python-saharaclient - fi - if [ "0" -eq 1 ] ; then - export DEVSTACK_GATE_TOPOLOGY="multinode" - fi - if [ "0" -eq 1 ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"SAHARA_USE_MOD_WSGI=True" - fi - if [ "0" -eq 1 ] ; then - export DEVSTACK_GATE_USE_PYTHON3=True - fi - export BRANCH_OVERRIDE=default - if [ "default" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - function pre_test_hook { - cd /opt/stack/new/sahara-tests/tools/gate/scenario - ./pre_test_hook.sh neutron fake - } - export -f pre_test_hook - - function post_test_hook { - cd /opt/stack/new/sahara-tests/tools/gate/scenario - ./post_test_hook.sh neutron fake - } - 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/sahara-dsvm-scenario-py3/post.yaml b/playbooks/legacy/sahara-dsvm-scenario-py3/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/sahara-dsvm-scenario-py3/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/sahara-dsvm-scenario-py3/run.yaml b/playbooks/legacy/sahara-dsvm-scenario-py3/run.yaml deleted file mode 100644 index 0159f2aa..00000000 --- a/playbooks/legacy/sahara-dsvm-scenario-py3/run.yaml +++ /dev/null @@ -1,80 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-sahara-dsvm-scenario-py3 from old job gate-sahara-dsvm-scenario-py3-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 - export PYTHONUNBUFFERED=true - export DEVSTACK_SUBNODE_CONFIG=" " - export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export KEEP_LOCALRC=1 - export PROJECTS="openstack/sahara $PROJECTS" - export PROJECTS="openstack/sahara-tests $PROJECTS" - export PROJECTS="openstack/sahara-image-elements openstack/sahara-extra $PROJECTS" - if [ "neutron" == "nova" ] ; then - export DEVSTACK_GATE_NEUTRON=0 - else - export DEVSTACK_GATE_NEUTRON=1 - fi - if [ "$ZUUL_PROJECT" = "openstack/python-saharaclient" ]; then - export DEVSTACK_PROJECT_FROM_GIT=python-saharaclient - fi - if [ "0" -eq 1 ] ; then - export DEVSTACK_GATE_TOPOLOGY="multinode" - fi - if [ "0" -eq 1 ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"SAHARA_USE_MOD_WSGI=True" - fi - if [ "1" -eq 1 ] ; then - export DEVSTACK_GATE_USE_PYTHON3=True - fi - export BRANCH_OVERRIDE=default - if [ "default" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - function pre_test_hook { - cd /opt/stack/new/sahara-tests/tools/gate/scenario - ./pre_test_hook.sh neutron fake - } - export -f pre_test_hook - - function post_test_hook { - cd /opt/stack/new/sahara-tests/tools/gate/scenario - ./post_test_hook.sh neutron fake - } - 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/tempest-dsvm-neutron-src-python-saharaclient/post.yaml b/playbooks/legacy/tempest-dsvm-neutron-src-python-saharaclient/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-neutron-src-python-saharaclient/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/tempest-dsvm-neutron-src-python-saharaclient/run.yaml b/playbooks/legacy/tempest-dsvm-neutron-src-python-saharaclient/run.yaml deleted file mode 100644 index 68266fcf..00000000 --- a/playbooks/legacy/tempest-dsvm-neutron-src-python-saharaclient/run.yaml +++ /dev/null @@ -1,61 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-neutron-src-python-saharaclient from - old job gate-tempest-dsvm-neutron-src-python-saharaclient-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 sahara git://git.openstack.org/openstack/sahara - enable_plugin heat git://git.openstack.org/openstack/heat - TEMPEST_PLUGINS='/opt/stack/new/sahara-tests' - - 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 DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export PROJECTS="openstack/sahara $PROJECTS" - export PROJECTS="openstack/sahara-tests $PROJECTS" - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export DEVSTACK_PROJECT_FROM_GIT=python-saharaclient - 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/tempest-dsvm-sahara/post.yaml b/playbooks/legacy/tempest-dsvm-sahara/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-sahara/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/tempest-dsvm-sahara/run.yaml b/playbooks/legacy/tempest-dsvm-sahara/run.yaml deleted file mode 100644 index ec6276a9..00000000 --- a/playbooks/legacy/tempest-dsvm-sahara/run.yaml +++ /dev/null @@ -1,71 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-sahara from old job gate-tempest-dsvm-sahara-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 sahara git://git.openstack.org/openstack/sahara - enable_plugin heat git://git.openstack.org/openstack/heat - enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer - TEMPEST_PLUGINS='/opt/stack/new/sahara-tests' - - 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 DEVSTACK_GATE_TEMPEST=1 - export KEEP_LOCALRC=1 - export DEVSTACK_GATE_TEMPEST_REGEX="(sahara_tempest_plugin.tests.api|sahara_tempest_plugin.tests.clients|data_processing)" - export PROJECTS="openstack/sahara $PROJECTS" - export PROJECTS="openstack/sahara-tests $PROJECTS" - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - # required at least by client tests (python and CLI) - function pre_test_hook { - cd /opt/stack/new/sahara-tests/tools/gate/cli_tests - ./pre_test_hook.sh - } - - export -f pre_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 85c57b02..f9475266 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -3549,34 +3549,6 @@ - openstack/trove-dashboard - openstack/zaqar -- job: - name: legacy-sahara-buildimages-ambari-centos-7 - parent: legacy-base - run: playbooks/legacy/sahara-buildimages-ambari-centos-7/run.yaml - timeout: 7200 - nodeset: legacy-centos-7 - -- job: - name: legacy-sahara-buildimages-cloudera-centos-7 - parent: legacy-base - run: playbooks/legacy/sahara-buildimages-cloudera-centos-7/run.yaml - timeout: 7200 - nodeset: legacy-centos-7 - -- job: - name: legacy-sahara-cli - parent: legacy-dsvm-base - run: playbooks/legacy/sahara-cli/run.yaml - post-run: playbooks/legacy/sahara-cli/post.yaml - timeout: 4200 - required-projects: - - openstack-dev/devstack - - openstack-infra/devstack-gate - - openstack/ara - - openstack/python-saharaclient - - openstack/sahara - - openstack/sahara-tests - - job: name: legacy-sahara-dashboard-dsvm-integration parent: legacy-dsvm-base @@ -3590,22 +3562,6 @@ - openstack/sahara - openstack/sahara-dashboard -- job: - name: legacy-sahara-dsvm-scenario-mod-wsgi - parent: legacy-dsvm-base - run: playbooks/legacy/sahara-dsvm-scenario-mod-wsgi/run.yaml - post-run: playbooks/legacy/sahara-dsvm-scenario-mod-wsgi/post.yaml - timeout: 7800 - required-projects: - - openstack-dev/devstack - - openstack-infra/devstack-gate - - openstack/ara - - openstack/python-saharaclient - - openstack/sahara - - openstack/sahara-extra - - openstack/sahara-image-elements - - openstack/sahara-tests - - job: name: legacy-sahara-dsvm-scenario-multinode-spark parent: legacy-dsvm-base-multinode @@ -3623,39 +3579,6 @@ - openstack/sahara-tests nodeset: legacy-ubuntu-xenial-2-node -- job: - name: legacy-sahara-dsvm-scenario-neutron - parent: legacy-dsvm-base - run: playbooks/legacy/sahara-dsvm-scenario-neutron/run.yaml - post-run: playbooks/legacy/sahara-dsvm-scenario-neutron/post.yaml - timeout: 7800 - required-projects: - - openstack-dev/devstack - - openstack-infra/devstack-gate - - openstack/ara - - openstack/neutron - - openstack/python-saharaclient - - openstack/sahara - - openstack/sahara-extra - - openstack/sahara-image-elements - - openstack/sahara-tests - -- job: - name: legacy-sahara-dsvm-scenario-py3 - parent: legacy-dsvm-base - run: playbooks/legacy/sahara-dsvm-scenario-py3/run.yaml - post-run: playbooks/legacy/sahara-dsvm-scenario-py3/post.yaml - timeout: 7800 - required-projects: - - openstack-dev/devstack - - openstack-infra/devstack-gate - - openstack/ara - - openstack/python-saharaclient - - openstack/sahara - - openstack/sahara-extra - - openstack/sahara-image-elements - - openstack/sahara-tests - - job: name: legacy-sahara-extra-artifacts parent: legacy-base @@ -4367,22 +4290,6 @@ - openstack/oslo.versionedobjects - openstack/tempest -- job: - name: legacy-tempest-dsvm-neutron-src-python-saharaclient - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-neutron-src-python-saharaclient/run.yaml - post-run: playbooks/legacy/tempest-dsvm-neutron-src-python-saharaclient/post.yaml - timeout: 7800 - required-projects: - - openstack-dev/devstack - - openstack-infra/devstack-gate - - openstack/ara - - openstack/neutron - - openstack/python-saharaclient - - openstack/sahara - - openstack/sahara-tests - - openstack/tempest - - job: name: legacy-tempest-dsvm-neutron-src-plugin parent: legacy-dsvm-base @@ -4475,20 +4382,6 @@ - openstack/devstack-plugin-ceph - openstack/tempest -- job: - name: legacy-tempest-dsvm-sahara - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-sahara/run.yaml - post-run: playbooks/legacy/tempest-dsvm-sahara/post.yaml - timeout: 7800 - required-projects: - - openstack-dev/devstack - - openstack-infra/devstack-gate - - openstack/ara - - openstack/sahara - - openstack/sahara-tests - - openstack/tempest - - job: name: legacy-tempest-dsvm-zeromq-multibackend parent: legacy-dsvm-base