From dea5809f942fdb4031da017ce0b2a5310f21eab6 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 13 Oct 2017 19:20:59 +0200 Subject: [PATCH] Remove api-guide remains Remove api-guide and api-ref jobs and api-guide playbook, these are not used anymore, we have native v3 jobs now. Change-Id: I0563e3e07f820aa9f598e85adec84bfbbb87e05e --- playbooks/legacy/api-guide/post.yaml | 75 ---------------------------- playbooks/legacy/api-guide/run.yaml | 63 ----------------------- zuul.d/zuul-legacy-jobs.yaml | 27 ---------- 3 files changed, 165 deletions(-) delete mode 100644 playbooks/legacy/api-guide/post.yaml delete mode 100644 playbooks/legacy/api-guide/run.yaml diff --git a/playbooks/legacy/api-guide/post.yaml b/playbooks/legacy/api-guide/post.yaml deleted file mode 100644 index 22db1c2f..00000000 --- a/playbooks/legacy/api-guide/post.yaml +++ /dev/null @@ -1,75 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from api-guide/build/html/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/api-guide/build/html/' - dest: '{{ zuul.executor.log_root }}/html/' - mode: pull - copy_links: true - verify_host: true - - - 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/api-guide/run.yaml b/playbooks/legacy/api-guide/run.yaml deleted file mode 100644 index 16ca10e9..00000000 --- a/playbooks/legacy/api-guide/run.yaml +++ /dev/null @@ -1,63 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-api-guide from old job gate-{name}-api-guide - 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: | - 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 api-guide - 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 257ac871..d64e5757 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -130,33 +130,6 @@ - openstack/aodh - openstack/tempest -- job: - name: legacy-api-guide - parent: legacy-base - success-url: html/ - run: playbooks/legacy/api-guide/run - post-run: playbooks/legacy/api-guide/post - timeout: 1800 - branches: master - files: - - ^tox.ini$ - - ^api-guide/.* - -- job: - name: legacy-api-ref - parent: legacy-base - success-url: html/ - run: playbooks/legacy/api-ref/run - post-run: playbooks/legacy/api-ref/post - timeout: 1800 - branches: master - required-projects: - - openstack/requirements - files: - - ^tox.ini$ - - ^api-ref/.* - - ^doc/api_samples/.* - - job: name: legacy-app-catalog-nodejs4-npm-run-lint parent: legacy-base