From e2ba3319c425768d4e71e48d58d0150dd4b16d95 Mon Sep 17 00:00:00 2001 From: Brian Rosmaita Date: Sun, 3 Dec 2017 23:19:09 -0500 Subject: [PATCH] Remove python-glanceclient legacy jobs Depends-On: I0b974bf60da6bafabeb037a75ac10654e2a6406c Change-Id: I0271a1430843ef546e991a7a3c4b572b3e404963 --- .../post.yaml | 80 ------------------- .../run.yaml | 55 ------------- .../glanceclient-dsvm-functional/post.yaml | 80 ------------------- .../glanceclient-dsvm-functional/run.yaml | 54 ------------- zuul.d/zuul-legacy-jobs.yaml | 22 ----- 5 files changed, 291 deletions(-) delete mode 100644 playbooks/legacy/glanceclient-dsvm-functional-identity-v3-only/post.yaml delete mode 100644 playbooks/legacy/glanceclient-dsvm-functional-identity-v3-only/run.yaml delete mode 100644 playbooks/legacy/glanceclient-dsvm-functional/post.yaml delete mode 100644 playbooks/legacy/glanceclient-dsvm-functional/run.yaml diff --git a/playbooks/legacy/glanceclient-dsvm-functional-identity-v3-only/post.yaml b/playbooks/legacy/glanceclient-dsvm-functional-identity-v3-only/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/glanceclient-dsvm-functional-identity-v3-only/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/glanceclient-dsvm-functional-identity-v3-only/run.yaml b/playbooks/legacy/glanceclient-dsvm-functional-identity-v3-only/run.yaml deleted file mode 100644 index dd4ae407..00000000 --- a/playbooks/legacy/glanceclient-dsvm-functional-identity-v3-only/run.yaml +++ /dev/null @@ -1,55 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-glanceclient-dsvm-functional-identity-v3-only from - old job gate-glanceclient-dsvm-functional-identity-v3-only-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 BRANCH_OVERRIDE=default - export DEVSTACK_PROJECT_FROM_GIT=python-glanceclient - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - if [ "-identity-v3-only" == "-identity-v3-only" ] ; then - export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False" - fi - - # TODO(rosmaita): remove when glanceclient tests no longer - # use the Images v1 API - export DEVSTACK_LOCAL_CONFIG+=$'\n'"GLANCE_V1_ENABLED=True" - - function post_test_hook { - # Configure and run functional tests - $BASE/new/python-glanceclient/glanceclient/tests/functional/hooks/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/glanceclient-dsvm-functional/post.yaml b/playbooks/legacy/glanceclient-dsvm-functional/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/glanceclient-dsvm-functional/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/glanceclient-dsvm-functional/run.yaml b/playbooks/legacy/glanceclient-dsvm-functional/run.yaml deleted file mode 100644 index 464ab5d7..00000000 --- a/playbooks/legacy/glanceclient-dsvm-functional/run.yaml +++ /dev/null @@ -1,54 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-glanceclient-dsvm-functional from old job gate-glanceclient-dsvm-functional-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 BRANCH_OVERRIDE=default - export DEVSTACK_PROJECT_FROM_GIT=python-glanceclient - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - if [ "" == "-identity-v3-only" ] ; then - export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False" - fi - - # TODO(rosmaita): remove when glanceclient tests no longer - # use the Images v1 API - export DEVSTACK_LOCAL_CONFIG+=$'\n'"GLANCE_V1_ENABLED=True" - - function post_test_hook { - # Configure and run functional tests - $BASE/new/python-glanceclient/glanceclient/tests/functional/hooks/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 66b50031..8179432c 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -792,28 +792,6 @@ - openstack/glance_store - openstack/swift -- job: - name: legacy-glanceclient-dsvm-functional - parent: legacy-dsvm-base - run: playbooks/legacy/glanceclient-dsvm-functional/run.yaml - post-run: playbooks/legacy/glanceclient-dsvm-functional/post.yaml - timeout: 4200 - required-projects: - - openstack-infra/devstack-gate - - openstack/glance - - openstack/python-glanceclient - -- job: - name: legacy-glanceclient-dsvm-functional-identity-v3-only - parent: legacy-dsvm-base - run: playbooks/legacy/glanceclient-dsvm-functional-identity-v3-only/run.yaml - post-run: playbooks/legacy/glanceclient-dsvm-functional-identity-v3-only/post.yaml - timeout: 4200 - required-projects: - - openstack-infra/devstack-gate - - openstack/glance - - openstack/python-glanceclient - - job: name: legacy-glare-dsvm parent: legacy-dsvm-base