From 0b6fa0fb8f9d0a8187561339f3e557985b3151b2 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 27 Dec 2017 18:00:08 +0100 Subject: [PATCH] Remove legacy-grenade-publish-docs This job has been replaced by a native Zuul v3 job. Change-Id: Ibbc60d3d6e66b7f6a850ebd9268c5b5b36c37baa Depends-On: I6743079d4908fb4585c3714efcd0af7d4b404588 --- .../legacy/grenade-publish-docs/run.yaml | 73 ------------------- zuul.d/zuul-legacy-jobs.yaml | 6 -- 2 files changed, 79 deletions(-) delete mode 100644 playbooks/legacy/grenade-publish-docs/run.yaml diff --git a/playbooks/legacy/grenade-publish-docs/run.yaml b/playbooks/legacy/grenade-publish-docs/run.yaml deleted file mode 100644 index 06d2e77d..00000000 --- a/playbooks/legacy/grenade-publish-docs/run.yaml +++ /dev/null @@ -1,73 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-grenade-publish-docs from old job grenade-publish-docs - 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 docs - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - MARKER_TEXT="Project: $ZUUL_PROJECT Ref: $ZUUL_REFNAME Build: $ZUUL_UUID Revision: $ZUUL_NEWREV" - echo $MARKER_TEXT > doc/build/html/.root-marker - 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 1d16365d..67f50e9d 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -921,12 +921,6 @@ - openstack/trove - openstack/trove-dashboard -- job: - name: legacy-grenade-publish-docs - parent: legacy-base - run: playbooks/legacy/grenade-publish-docs/run.yaml - timeout: 1800 - - job: name: legacy-group-based-policy-dsvm-aim parent: legacy-dsvm-base