From eb422ddc5389e9b5d85fc2e547a2b56977f60725 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 21 Jan 2018 22:00:37 +0100 Subject: [PATCH] Convert bashate-python36-fedora-26 to Zuul v3 Convert the job to native Zuul v3. The repo does not use upper-constraints, so there's no need to use openstack/requirements. Rename the job to follow our naming pattern for tox jobs. Also, remove project name from stanza, it's not needed for in-tree configuration anymore. Change-Id: If79bc60b7e60d172c64dee1cd7900853aa7a1f37 --- .zuul.d/jobs.yaml | 16 ++-- .../bashate-python36-fedora-26/post.yaml | 67 --------------- .../bashate-python36-fedora-26/run.yaml | 86 ------------------- 3 files changed, 6 insertions(+), 163 deletions(-) delete mode 100644 playbooks/legacy/bashate-python36-fedora-26/post.yaml delete mode 100644 playbooks/legacy/bashate-python36-fedora-26/run.yaml diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index f14ff51..a055ee4 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -1,10 +1,9 @@ - project: - name: openstack-dev/bashate check: jobs: - bashate-devstack: voting: false - - bashate-python36-fedora-26: + - bashate-tox-py36-fedora-26: voting: false - job: @@ -18,11 +17,8 @@ - openstack-infra/devstack-gate - job: - name: bashate-python36-fedora-26 - parent: legacy-base - run: playbooks/legacy/bashate-python36-fedora-26/run.yaml - post-run: playbooks/legacy/bashate-python36-fedora-26/post.yaml - timeout: 2400 - nodeset: legacy-fedora-26 - required-projects: - - openstack/requirements + name: bashate-tox-py36-fedora-26 + parent: tox + vars: + tox_envlist: py36 + nodeset: fedora-26 diff --git a/playbooks/legacy/bashate-python36-fedora-26/post.yaml b/playbooks/legacy/bashate-python36-fedora-26/post.yaml deleted file mode 100644 index 68fbdf8..0000000 --- a/playbooks/legacy/bashate-python36-fedora-26/post.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 diff --git a/playbooks/legacy/bashate-python36-fedora-26/run.yaml b/playbooks/legacy/bashate-python36-fedora-26/run.yaml deleted file mode 100644 index e151823..0000000 --- a/playbooks/legacy/bashate-python36-fedora-26/run.yaml +++ /dev/null @@ -1,86 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-bashate-python36-fedora-26 from old job gate-bashate-python36-fedora-26-nv - tasks: - - - name: Ensure legacy 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 py36 - 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 }}'