From 0e4ec17cc3fa3edc6e1cb32807b4d6fcefa78521 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 30 Jan 2018 14:25:06 +0100 Subject: [PATCH] Remove broken job magnum-non-functional-tox-migration This job cannot work, it calls 'tox -e migration' but there's no migration environment. Remove it, it's not needed and used. Note that this is an alternative to change https://review.openstack.org/537785 . Change-Id: I38034695958b65c6d8abfa67ab51dfd719cb8ef6 --- .zuul.yaml | 10 ---- playbooks/magnum-tox-migration.yaml | 85 ----------------------------- playbooks/post/upload-logs-tox.yaml | 67 ----------------------- 3 files changed, 162 deletions(-) delete mode 100644 playbooks/magnum-tox-migration.yaml delete mode 100644 playbooks/post/upload-logs-tox.yaml diff --git a/.zuul.yaml b/.zuul.yaml index 60bae81e2a..285f125188 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -230,15 +230,6 @@ - ^magnum/drivers/mesos.*$ - ^magnum/drivers/swarm_fedora_atomic_v1/.*$ -- job: - name: magnum-non-functional-tox-migration - nodeset: legacy-ubuntu-xenial - run: playbooks/magnum-tox-migration.yaml - post-run: playbooks/post/upload-logs-tox.yaml - timeout: 2400 - required-projects: - - openstack/requirements - - job: name: magnum-buildimages-base parent: legacy-publish-openstack-artifacts @@ -288,7 +279,6 @@ - magnum-functional-swarm-ironic - magnum-functional-k8s-multinode - magnum-functional-swarm-mode-multinode - - magnum-non-functional-tox-migration periodic: jobs: - magnum-dib-buildimage-fedora-atomic-25 diff --git a/playbooks/magnum-tox-migration.yaml b/playbooks/magnum-tox-migration.yaml deleted file mode 100644 index bd415b753d..0000000000 --- a/playbooks/magnum-tox-migration.yaml +++ /dev/null @@ -1,85 +0,0 @@ -- hosts: primary - tasks: - - - name: Ensure workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - REQS_DIR=`mktemp -d` - function cleanup { - mkdir -p $WORKSPACE - rm -rf $CLONEMAP $REQS_DIR - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - # zuul cloner works poorly if there are 2 names that are the - # same in here. - if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then - cat >> $CLONEMAP << EOF - - name: openstack/requirements - dest: $REQS_DIR - EOF - fi - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT openstack/requirements - # REQS_DIR is not set for openstack/requirements and there is also - # no need to copy in this case. - if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then - cp $REQS_DIR/upper-constraints.txt ./ - fi - 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: | - if [ -x tools/test-setup.sh ] ; then - tools/test-setup.sh - fi - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -x - sudo rm -f /etc/sudoers.d/zuul - # Prove that general sudo access is actually revoked - ! sudo -n true - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/run-tox.sh migration - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - OUT=`git ls-files --other --exclude-standard --directory` - if [ -z "$OUT" ]; then - echo "No extra files created during test." - exit 0 - else - echo "The following un-ignored files were created during the test:" - echo "$OUT" - exit 0 # TODO: change to 1 to fail tests. - fi - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/post/upload-logs-tox.yaml b/playbooks/post/upload-logs-tox.yaml deleted file mode 100644 index 68fbdf81bf..0000000000 --- a/playbooks/post/upload-logs-tox.yaml +++ /dev/null @@ -1,67 +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