From 9b0e63c8d0d09fc94e7815188c29115cc8b53356 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 25 Aug 2018 17:19:59 +0200 Subject: [PATCH] Remove astara jobs Remove legacy jobs, they fail. If astara gets new life, they can be moved in-tree. Change-Id: I0eee51e3dc6c955ea749aa2b33b0d3ab8119b8b6 Depends-On: https://review.openstack.org/596537 --- .../astara-appliance-buildimage/post.yaml | 21 ------ .../astara-appliance-buildimage/run.yaml | 65 ------------------- .../post.yaml | 15 ----- .../run.yaml | 65 ------------------- .../legacy/functional-dsvm-astara/post.yaml | 15 ----- .../legacy/functional-dsvm-astara/run.yaml | 64 ------------------ zuul.d/zuul-legacy-jobs.yaml | 35 ---------- 7 files changed, 280 deletions(-) delete mode 100644 playbooks/legacy/astara-appliance-buildimage/post.yaml delete mode 100644 playbooks/legacy/astara-appliance-buildimage/run.yaml delete mode 100644 playbooks/legacy/functional-dsvm-astara-appliance-src/post.yaml delete mode 100644 playbooks/legacy/functional-dsvm-astara-appliance-src/run.yaml delete mode 100644 playbooks/legacy/functional-dsvm-astara/post.yaml delete mode 100644 playbooks/legacy/functional-dsvm-astara/run.yaml diff --git a/playbooks/legacy/astara-appliance-buildimage/post.yaml b/playbooks/legacy/astara-appliance-buildimage/post.yaml deleted file mode 100644 index 00a1174f..00000000 --- a/playbooks/legacy/astara-appliance-buildimage/post.yaml +++ /dev/null @@ -1,21 +0,0 @@ -- hosts: primary - tasks: - - - name: Ensure artifacts directory exists - file: - path: '{{ zuul.executor.work_root }}/artifacts' - state: directory - delegate_to: localhost - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.work_root }}/artifacts/images' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/astara_appliance*.qcow2 - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/astara-appliance-buildimage/run.yaml b/playbooks/legacy/astara-appliance-buildimage/run.yaml deleted file mode 100644 index 9c29a758..00000000 --- a/playbooks/legacy/astara-appliance-buildimage/run.yaml +++ /dev/null @@ -1,65 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-astara-appliance-buildimage from old job astara-appliance-buildimage-ubuntu-xenial - roles: - - bindep - - 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: | - sudo apt-get update - sudo apt-get install -y qemu kpartx debootstrap - sudo -H pip install dib-utils - sudo -H pip install diskimage-builder - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - tox -e build_image - if [[ "$ZUUL_REFNAME" =~ "stable" ]]; then - branch="$(echo $ZUUL_REFNAME | cut -d/ -f2)" - branch_tag="_$branch" - else - branch_tag="" - fi - mv build/astara_appliance*.qcow2 $WORKSPACE/astara_appliance$branch_tag.qcow2 - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/functional-dsvm-astara-appliance-src/post.yaml b/playbooks/legacy/functional-dsvm-astara-appliance-src/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/functional-dsvm-astara-appliance-src/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/functional-dsvm-astara-appliance-src/run.yaml b/playbooks/legacy/functional-dsvm-astara-appliance-src/run.yaml deleted file mode 100644 index e65d5afc..00000000 --- a/playbooks/legacy/functional-dsvm-astara-appliance-src/run.yaml +++ /dev/null @@ -1,65 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-functional-dsvm-astara-appliance-src from old job - gate-functional-dsvm-astara-appliance-src-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_GATE_TEMPEST=0 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_HORIZON=1 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - export PROJECTS="openstack/astara $PROJECTS" - export PROJECTS="openstack/astara-neutron $PROJECTS" - export PROJECTS="openstack/astara-appliance $PROJECTS" - export PROJECTS="openstack/astara-horizon $PROJECTS" - - export DEVSTACK_LOCAL_CONFIG="enable_plugin astara https://git.openstack.org/openstack/astara" - - export BUILD_APPLIANCE=1 - if [ "$BUILD_APPLIANCE" == "1" ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"BUILD_ASTARA_APPLIANCE_IMAGE=True" - fi - - if [ "$DEVSTACK_GATE_TEMPEST" == "0" ]; then - function post_test_hook { - source $BASE/new/devstack/openrc admin admin - cd /opt/stack/new/astara - sudo -H -E -u stack ./tools/run_functional.sh - } - export -f post_test_hook - 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/functional-dsvm-astara/post.yaml b/playbooks/legacy/functional-dsvm-astara/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/functional-dsvm-astara/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/functional-dsvm-astara/run.yaml b/playbooks/legacy/functional-dsvm-astara/run.yaml deleted file mode 100644 index e5fb5428..00000000 --- a/playbooks/legacy/functional-dsvm-astara/run.yaml +++ /dev/null @@ -1,64 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-functional-dsvm-astara from old job gate-functional-dsvm-astara-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_GATE_TEMPEST=0 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_HORIZON=1 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - export PROJECTS="openstack/astara $PROJECTS" - export PROJECTS="openstack/astara-neutron $PROJECTS" - export PROJECTS="openstack/astara-appliance $PROJECTS" - export PROJECTS="openstack/astara-horizon $PROJECTS" - - export DEVSTACK_LOCAL_CONFIG="enable_plugin astara https://git.openstack.org/openstack/astara" - - export BUILD_APPLIANCE=0 - if [ "$BUILD_APPLIANCE" == "1" ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"BUILD_ASTARA_APPLIANCE_IMAGE=True" - fi - - if [ "$DEVSTACK_GATE_TEMPEST" == "0" ]; then - function post_test_hook { - source $BASE/new/devstack/openrc admin admin - cd /opt/stack/new/astara - sudo -H -E -u stack ./tools/run_functional.sh - } - export -f post_test_hook - 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/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index 6af9ca81..d00c518d 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -4,13 +4,6 @@ run: playbooks/legacy/ansible-lint/run.yaml timeout: 1800 -- job: - name: legacy-astara-appliance-buildimage - parent: legacy-publish-openstack-artifacts - run: playbooks/legacy/astara-appliance-buildimage/run.yaml - post-run: playbooks/legacy/astara-appliance-buildimage/post.yaml - timeout: 1800 - - job: name: legacy-barbican-simple-crypto-dsvm-tempest-nova parent: legacy-dsvm-base @@ -153,34 +146,6 @@ run: playbooks/legacy/fuel-octane-puppet-lint/run.yaml timeout: 1800 -- job: - name: legacy-functional-dsvm-astara - parent: legacy-dsvm-base - run: playbooks/legacy/functional-dsvm-astara/run.yaml - post-run: playbooks/legacy/functional-dsvm-astara/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/ara - - openstack/astara - - openstack/astara-appliance - - openstack/astara-horizon - - openstack/astara-neutron - -- job: - name: legacy-functional-dsvm-astara-appliance-src - parent: legacy-dsvm-base - run: playbooks/legacy/functional-dsvm-astara-appliance-src/run.yaml - post-run: playbooks/legacy/functional-dsvm-astara-appliance-src/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/ara - - openstack/astara - - openstack/astara-appliance - - openstack/astara-horizon - - openstack/astara-neutron - - job: name: legacy-functional-neutron-dsvm-gceapi parent: legacy-dsvm-base