From adfeb41300ae259a8e255599574c2adb153f0b4b Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Wed, 25 Oct 2017 09:18:18 -0500 Subject: [PATCH] Remove osc-dsvm-functional* jobs Depends-On: I5dd13e2b8047eb9963b38f9ca3561b629a90f6ed Change-Id: I73642fa8f8f02413769dfa8d3ddd05cab6c21215 --- .../osc-dsvm-functional-n-net/post.yaml | 80 ----------------- .../legacy/osc-dsvm-functional-n-net/run.yaml | 85 ------------------ .../legacy/osc-dsvm-functional-tips/post.yaml | 80 ----------------- .../legacy/osc-dsvm-functional-tips/run.yaml | 90 ------------------- .../legacy/osc-dsvm-functional/post.yaml | 80 ----------------- playbooks/legacy/osc-dsvm-functional/run.yaml | 83 ----------------- zuul.d/zuul-legacy-jobs.yaml | 33 ------- 7 files changed, 531 deletions(-) delete mode 100644 playbooks/legacy/osc-dsvm-functional-n-net/post.yaml delete mode 100644 playbooks/legacy/osc-dsvm-functional-n-net/run.yaml delete mode 100644 playbooks/legacy/osc-dsvm-functional-tips/post.yaml delete mode 100644 playbooks/legacy/osc-dsvm-functional-tips/run.yaml delete mode 100644 playbooks/legacy/osc-dsvm-functional/post.yaml delete mode 100644 playbooks/legacy/osc-dsvm-functional/run.yaml diff --git a/playbooks/legacy/osc-dsvm-functional-n-net/post.yaml b/playbooks/legacy/osc-dsvm-functional-n-net/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/osc-dsvm-functional-n-net/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/osc-dsvm-functional-n-net/run.yaml b/playbooks/legacy/osc-dsvm-functional-n-net/run.yaml deleted file mode 100644 index cb06ff81..00000000 --- a/playbooks/legacy/osc-dsvm-functional-n-net/run.yaml +++ /dev/null @@ -1,85 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-osc-dsvm-functional-n-net from old job gate-osc-dsvm-functional-n-net-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]] - # NOTE(RuiChen): nova-network only can be enable in nova cell v1 - enable_service n-net n-cell - disable_service neutron q-svc q-agt q-dhcp q-l3 q-meta q-metering - # NOTE(dtroyer): OSC needs to support Image v1 for a while yet so re-enable - GLANCE_V1_ENABLED=True - # NOTE(dtroyer): Functional tests need a bit more volume headroom - VOLUME_BACKING_FILE_SIZE=20G - # NOTE(dtroyer): OSC needs to support Volume v1 for a while yet so re-enable - [[post-config|$CINDER_CONF]] - [DEFAULT] - enable_v1_api = True - - 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_UNSTACK=0 - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - # NOTE(RuiChen): Explicitly tell devstack-gate that we need to run - # the nova-network job with cell v1. - export DEVSTACK_GATE_NEUTRON=0 - export DEVSTACK_GATE_CELLS=1 - export BRANCH_OVERRIDE=default - export DEVSTACK_PROJECT_FROM_GIT=python-openstackclient - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - function post_test_hook { - # NOTE(stevemar): After the newton release was tagged the file was moved. - # But, we run functional tests for various stable releases - # (mitaka, and newton). - # TODO(stevemar): Remove this check when Newton hits EOL. - hook_location=$BASE/new/python-openstackclient/openstackclient/tests/functional/post_test_hook.sh - if [ ! -f "$hook_location" ]; then - hook_location=$BASE/new/python-openstackclient/post_test_hook.sh - fi - bash -xe $hook_location - } - 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/osc-dsvm-functional-tips/post.yaml b/playbooks/legacy/osc-dsvm-functional-tips/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/osc-dsvm-functional-tips/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/osc-dsvm-functional-tips/run.yaml b/playbooks/legacy/osc-dsvm-functional-tips/run.yaml deleted file mode 100644 index 7bd53738..00000000 --- a/playbooks/legacy/osc-dsvm-functional-tips/run.yaml +++ /dev/null @@ -1,90 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-osc-dsvm-functional-tips from old job gate-osc-dsvm-functional-tips-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]] - # NOTE(amotoki): Some neutron features are enabled by devstack plugin - enable_plugin neutron https://git.openstack.org/openstack/neutron - enable_service q-qos - enable_service neutron-segments - # NOTE(dtroyer): OSC needs to support Image v1 for a while yet so re-enable - GLANCE_V1_ENABLED=True - # NOTE(dtroyer): Functional tests need a bit more volume headroom - VOLUME_BACKING_FILE_SIZE=20G - # Swift is not ready for python3 yet: At a minimum keystonemiddleware needs - # to be installed in the py2 env, there are probably other things too... - disable_service s-account - disable_service s-container - disable_service s-object - disable_service s-proxy - # This is insufficient, but leaving it here as a reminder of what may - # someday be all we need to make this work - disable_python3_package swift - # NOTE(dtroyer): OSC needs to support Volume v1 for a while yet so re-enable - [[post-config|$CINDER_CONF]] - [DEFAULT] - enable_v1_api = True - - 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_USE_PYTHON3=True - export DEVSTACK_GATE_UNSTACK=0 - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export DEVSTACK_GATE_NEUTRON=1 - export BRANCH_OVERRIDE=default - export DEVSTACK_PROJECT_FROM_GIT="python-openstackclient,python-openstacksdk,osc-lib,os-client-config" - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - function post_test_hook { - # This test hook will install the master version of the following: - # - osc-lib - # - openstacksdk - # - os-client-config - hook_location=$BASE/new/python-openstackclient/openstackclient/tests/functional/post_test_hook_tips.sh - bash -xe $hook_location - } - 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/osc-dsvm-functional/post.yaml b/playbooks/legacy/osc-dsvm-functional/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/osc-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/osc-dsvm-functional/run.yaml b/playbooks/legacy/osc-dsvm-functional/run.yaml deleted file mode 100644 index 185ba437..00000000 --- a/playbooks/legacy/osc-dsvm-functional/run.yaml +++ /dev/null @@ -1,83 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-osc-dsvm-functional from old job gate-osc-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 - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - # NOTE(amotoki): Some neutron features are enabled by devstack plugin - enable_plugin neutron https://git.openstack.org/openstack/neutron - enable_service q-qos - enable_service neutron-segments - # NOTE(dtroyer): OSC needs to support Image v1 for a while yet so re-enable - GLANCE_V1_ENABLED=True - # NOTE(dtroyer): Functional tests need a bit more volume headroom - VOLUME_BACKING_FILE_SIZE=20G - # NOTE(dtroyer): OSC needs to support Volume v1 for a while yet so re-enable - [[post-config|$CINDER_CONF]] - [DEFAULT] - enable_v1_api = True - - 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_UNSTACK=0 - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export DEVSTACK_GATE_NEUTRON=1 - export BRANCH_OVERRIDE=default - export DEVSTACK_PROJECT_FROM_GIT=python-openstackclient - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - function post_test_hook { - # NOTE(stevemar): After the newton release was tagged the file was moved. - # But, we run functional tests for various stable releases - # (mitaka, and newton). - # TODO(stevemar): Remove this check when Newton hits EOL. - hook_location=$BASE/new/python-openstackclient/openstackclient/tests/functional/post_test_hook.sh - if [ ! -f "$hook_location" ]; then - hook_location=$BASE/new/python-openstackclient/post_test_hook.sh - fi - bash -xe $hook_location - } - 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 50616b21..5e921e82 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -4599,39 +4599,6 @@ - openstack/freezer-web-ui - openstack/python-freezerclient -- job: - name: legacy-osc-dsvm-functional - parent: legacy-dsvm-base - run: playbooks/legacy/osc-dsvm-functional/run - post-run: playbooks/legacy/osc-dsvm-functional/post - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/python-openstackclient - -- job: - name: legacy-osc-dsvm-functional-n-net - parent: legacy-dsvm-base - run: playbooks/legacy/osc-dsvm-functional-n-net/run - post-run: playbooks/legacy/osc-dsvm-functional-n-net/post - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/python-openstackclient - -- job: - name: legacy-osc-dsvm-functional-tips - parent: legacy-dsvm-base - run: playbooks/legacy/osc-dsvm-functional-tips/run - post-run: playbooks/legacy/osc-dsvm-functional-tips/post - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/os-client-config - - openstack/osc-lib - - openstack/python-openstackclient - - openstack/python-openstacksdk - - job: name: legacy-osc-placement-dsvm-functional parent: legacy-dsvm-base