From 396ce758e9f1c6ec2e02aa284a722fd624af6b2e Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 17 Dec 2017 18:57:24 +0100 Subject: [PATCH] Use native v3 tox jobs Instead of a legacy tox job, use the already defined functional jobs that do the same. Note that those jobs are named "functional", so update tox.ini as well. Remove unused playbooks. Change-Id: Icdb1b94b0e69ffb55007e166705871010e8943c5 --- .../ironic-inspector-tox-func/post.yaml | 67 --------------- .../legacy/ironic-inspector-tox-func/run.yaml | 86 ------------------- .../ironic-inspector-tox-func3/post.yaml | 67 --------------- .../ironic-inspector-tox-func3/run.yaml | 86 ------------------- tox.ini | 6 +- zuul.d/legacy-ironic-inspector-jobs.yaml | 24 ------ zuul.d/project.yaml | 8 +- 7 files changed, 7 insertions(+), 337 deletions(-) delete mode 100644 playbooks/legacy/ironic-inspector-tox-func/post.yaml delete mode 100644 playbooks/legacy/ironic-inspector-tox-func/run.yaml delete mode 100644 playbooks/legacy/ironic-inspector-tox-func3/post.yaml delete mode 100644 playbooks/legacy/ironic-inspector-tox-func3/run.yaml diff --git a/playbooks/legacy/ironic-inspector-tox-func/post.yaml b/playbooks/legacy/ironic-inspector-tox-func/post.yaml deleted file mode 100644 index 68fbdf81b..000000000 --- a/playbooks/legacy/ironic-inspector-tox-func/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/ironic-inspector-tox-func/run.yaml b/playbooks/legacy/ironic-inspector-tox-func/run.yaml deleted file mode 100644 index 22bb0c714..000000000 --- a/playbooks/legacy/ironic-inspector-tox-func/run.yaml +++ /dev/null @@ -1,86 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-ironic-inspector-tox-func from old job gate-ironic-inspector-tox-func-ubuntu-xenial - 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 func - 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/legacy/ironic-inspector-tox-func3/post.yaml b/playbooks/legacy/ironic-inspector-tox-func3/post.yaml deleted file mode 100644 index 68fbdf81b..000000000 --- a/playbooks/legacy/ironic-inspector-tox-func3/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/ironic-inspector-tox-func3/run.yaml b/playbooks/legacy/ironic-inspector-tox-func3/run.yaml deleted file mode 100644 index 9a4493206..000000000 --- a/playbooks/legacy/ironic-inspector-tox-func3/run.yaml +++ /dev/null @@ -1,86 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-ironic-inspector-tox-func3 from old job gate-ironic-inspector-tox-func3-ubuntu-xenial - 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 func3 - 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/tox.ini b/tox.ini index 13a2937ae..3548c44b3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py35,py27,pep8,func +envlist = py35,py27,pep8,functional [testenv] usedevelop = True @@ -39,12 +39,12 @@ commands = flake8 ironic_inspector doc8 README.rst CONTRIBUTING.rst doc/source -[testenv:func] +[testenv:functional] basepython = python2.7 commands = python -m ironic_inspector.test.functional -[testenv:func3] +[testenv:functional-py35] basepython = python3 commands = python3 -m ironic_inspector.test.functional diff --git a/zuul.d/legacy-ironic-inspector-jobs.yaml b/zuul.d/legacy-ironic-inspector-jobs.yaml index fecc1af1e..372ab038f 100644 --- a/zuul.d/legacy-ironic-inspector-jobs.yaml +++ b/zuul.d/legacy-ironic-inspector-jobs.yaml @@ -1,27 +1,3 @@ -# 'func' jobs -- job: - name: ironic-inspector-tox-func-base - parent: legacy-base - required-projects: - - openstack/requirements - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - -- job: - name: ironic-inspector-tox-func - parent: ironic-inspector-tox-func-base - run: playbooks/legacy/ironic-inspector-tox-func/run.yaml - post-run: playbooks/legacy/ironic-inspector-tox-func/post.yaml - timeout: 2400 - -- job: - name: ironic-inspector-tox-func3 - parent: ironic-inspector-tox-func-base - run: playbooks/legacy/ironic-inspector-tox-func3/run.yaml - post-run: playbooks/legacy/ironic-inspector-tox-func3/post.yaml - timeout: 2400 - # DSVM jobs - job: name: ironic-inspector-dsvm-base diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 11c0f1f4b..1911fe759 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -4,8 +4,8 @@ jobs: - ironic-inspector-grenade-dsvm - ironic-inspector-tempest-dsvm-discovery - - ironic-inspector-tox-func - - ironic-inspector-tox-func3 + - openstack-tox-functional + - openstack-tox-functional-py35 - ironic-tempest-dsvm-ironic-inspector - ironic-inspector-tempest-dsvm-python3: voting: false @@ -13,6 +13,6 @@ jobs: - ironic-inspector-grenade-dsvm - ironic-inspector-tempest-dsvm-discovery - - ironic-inspector-tox-func - - ironic-inspector-tox-func3 + - openstack-tox-functional + - openstack-tox-functional-py35 - ironic-tempest-dsvm-ironic-inspector