From 5f7b425b4c4ca42262ba1952332370dc2e4413f1 Mon Sep 17 00:00:00 2001 From: Saad Zaher Date: Mon, 4 Dec 2017 12:43:06 +0000 Subject: [PATCH] Remove freezer-api legacy jobs Depends-On: I6f43146b01eaf088b3ff66d6d76fc44046d4e031 Change-Id: If5fb1f1ab6a1575dea63e92d8db9aa8d0af31232 --- .../post.yaml | 80 ------------------- .../run.yaml | 80 ------------------- .../osbackup-freezer-api-dsvm/post.yaml | 80 ------------------- .../legacy/osbackup-freezer-api-dsvm/run.yaml | 80 ------------------- zuul.d/zuul-legacy-jobs.yaml | 27 ------- 5 files changed, 347 deletions(-) delete mode 100644 playbooks/legacy/osbackup-freezer-api-dsvm-centos-7/post.yaml delete mode 100644 playbooks/legacy/osbackup-freezer-api-dsvm-centos-7/run.yaml delete mode 100644 playbooks/legacy/osbackup-freezer-api-dsvm/post.yaml delete mode 100644 playbooks/legacy/osbackup-freezer-api-dsvm/run.yaml diff --git a/playbooks/legacy/osbackup-freezer-api-dsvm-centos-7/post.yaml b/playbooks/legacy/osbackup-freezer-api-dsvm-centos-7/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/osbackup-freezer-api-dsvm-centos-7/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/osbackup-freezer-api-dsvm-centos-7/run.yaml b/playbooks/legacy/osbackup-freezer-api-dsvm-centos-7/run.yaml deleted file mode 100644 index 0aac7df2..00000000 --- a/playbooks/legacy/osbackup-freezer-api-dsvm-centos-7/run.yaml +++ /dev/null @@ -1,80 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-osbackup-freezer-api-dsvm-centos-7 from old job gate-osbackup-freezer-api-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 freezer-agent and freezer-scheduler - enable_plugin freezer git://git.openstack.org/openstack/freezer - # enable freezer-api and python-freezerclient - enable_plugin freezer-api https://git.openstack.org/openstack/freezer-api - # enable freezer-web-ui and python-freezerclient - enable_plugin freezer-web-ui https://git.openstack.org/openstack/freezer-web-ui - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - # checkout freezer components - export PROJECTS="openstack/freezer-api $PROJECTS" - export PROJECTS="openstack/freezer-web-ui $PROJECTS" - export PROJECTS="openstack/freezer $PROJECTS" - export PROJECTS="openstack/python-freezerclient $PROJECTS" - export DEVSTACK_GATE_HORIZON=1 - # tempest config - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 - TEMPEST_REGEX="$ZUUL_SHORT_PROJECT_NAME_tempest_plugin" - export DEVSTACK_GATE_TEMPEST_REGEX=${TEMPEST_REGEX/\-/\_ } - - # which repo is being tested - export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME - - # This ensures that if we set override branch to something - # else, we still take repo being tested from the zuul branch - # name. So override branch can be 'stable/mitaka' but we can - # test master changes. - uc_project=`echo $DEVSTACK_PROJECT_FROM_GIT | tr [:lower:] [:upper:] | tr '-' '_' | sed 's/[^A-Z_]//'` - export "OVERRIDE_"$uc_project"_PROJECT_BRANCH"=$ZUUL_BRANCH - - function gate_hook { - source $BASE/new/$ZUUL_SHORT_PROJECT_NAME/devstack/gate_hook.sh - } - export -f gate_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/osbackup-freezer-api-dsvm/post.yaml b/playbooks/legacy/osbackup-freezer-api-dsvm/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/osbackup-freezer-api-dsvm/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/osbackup-freezer-api-dsvm/run.yaml b/playbooks/legacy/osbackup-freezer-api-dsvm/run.yaml deleted file mode 100644 index c7c4875c..00000000 --- a/playbooks/legacy/osbackup-freezer-api-dsvm/run.yaml +++ /dev/null @@ -1,80 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-osbackup-freezer-api-dsvm from old job gate-osbackup-freezer-api-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 freezer-agent and freezer-scheduler - enable_plugin freezer git://git.openstack.org/openstack/freezer - # enable freezer-api and python-freezerclient - enable_plugin freezer-api https://git.openstack.org/openstack/freezer-api - # enable freezer-web-ui and python-freezerclient - enable_plugin freezer-web-ui https://git.openstack.org/openstack/freezer-web-ui - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - # checkout freezer components - export PROJECTS="openstack/freezer-api $PROJECTS" - export PROJECTS="openstack/freezer-web-ui $PROJECTS" - export PROJECTS="openstack/freezer $PROJECTS" - export PROJECTS="openstack/python-freezerclient $PROJECTS" - export DEVSTACK_GATE_HORIZON=1 - # tempest config - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 - TEMPEST_REGEX="$ZUUL_SHORT_PROJECT_NAME_tempest_plugin" - export DEVSTACK_GATE_TEMPEST_REGEX=${TEMPEST_REGEX/\-/\_ } - - # which repo is being tested - export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME - - # This ensures that if we set override branch to something - # else, we still take repo being tested from the zuul branch - # name. So override branch can be 'stable/mitaka' but we can - # test master changes. - uc_project=`echo $DEVSTACK_PROJECT_FROM_GIT | tr [:lower:] [:upper:] | tr '-' '_' | sed 's/[^A-Z_]//'` - export "OVERRIDE_"$uc_project"_PROJECT_BRANCH"=$ZUUL_BRANCH - - function gate_hook { - source $BASE/new/$ZUUL_SHORT_PROJECT_NAME/devstack/gate_hook.sh - } - export -f gate_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 0eb9c14d..8c2bbbc0 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -2642,33 +2642,6 @@ timeout: 3600 nodeset: legacy-ubuntu-trusty -- job: - name: legacy-osbackup-freezer-api-dsvm - parent: legacy-dsvm-base - run: playbooks/legacy/osbackup-freezer-api-dsvm/run.yaml - post-run: playbooks/legacy/osbackup-freezer-api-dsvm/post.yaml - timeout: 4200 - required-projects: - - openstack-infra/devstack-gate - - openstack/freezer - - openstack/freezer-api - - openstack/freezer-web-ui - - openstack/python-freezerclient - -- job: - name: legacy-osbackup-freezer-api-dsvm-centos-7 - parent: legacy-dsvm-base - run: playbooks/legacy/osbackup-freezer-api-dsvm-centos-7/run.yaml - post-run: playbooks/legacy/osbackup-freezer-api-dsvm-centos-7/post.yaml - timeout: 4200 - nodeset: legacy-centos-7 - required-projects: - - openstack-infra/devstack-gate - - openstack/freezer - - openstack/freezer-api - - openstack/freezer-web-ui - - openstack/python-freezerclient - - job: name: legacy-osbackup-freezer-web-ui-dsvm parent: legacy-dsvm-base