diff --git a/playbooks/legacy/monasca-thresh-localrepo-upload/post.yaml b/playbooks/legacy/monasca-thresh-localrepo-upload/post.yaml deleted file mode 100644 index e4888f22..00000000 --- a/playbooks/legacy/monasca-thresh-localrepo-upload/post.yaml +++ /dev/null @@ -1,21 +0,0 @@ -- hosts: primary - tasks: - - - name: Ensure artifacts directory exists - file: - path: '{{ zuul.executor.work_root }}/artifacts' - state: directory - delegate_to: localhost - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.work_root }}/artifacts/$ZUUL_SHORT_PROJECT_NAME' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/target/$ZUUL_SHORT_PROJECT_NAME-*.jar - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/monasca-thresh-localrepo-upload/run.yaml b/playbooks/legacy/monasca-thresh-localrepo-upload/run.yaml deleted file mode 100644 index 855b853c..00000000 --- a/playbooks/legacy/monasca-thresh-localrepo-upload/run.yaml +++ /dev/null @@ -1,61 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-monasca-thresh-localrepo-upload from old job monasca-thresh-localrepo-upload-ubuntu-xenial - roles: - - bindep - - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - # In cases where zuul-cloner is aborted during a git - # clone operation, git will remove the git work tree in - # its cleanup. The work tree in these jobs is the - # workspace directory, which means that subsequent - # jenkins post-build actions can not run because the - # workspace has been removed. - # To reduce the likelihood of this having an impact, - # recreate the workspace directory if needed - mkdir -p $WORKSPACE - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - https://opendev.org $ZUUL_PROJECT - executable: /bin/bash - 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: | - set -e - set -x - /usr/local/jenkins/slave_scripts/version-properties.sh - source version.properties - mvn clean package -Dproject-version=$PROJECT_VER - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/monasca-thresh-maven-build/run.yaml b/playbooks/legacy/monasca-thresh-maven-build/run.yaml deleted file mode 100644 index 6ef3cbbc..00000000 --- a/playbooks/legacy/monasca-thresh-maven-build/run.yaml +++ /dev/null @@ -1,61 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-monasca-thresh-maven-build from old job gate-monasca-thresh-maven-build-ubuntu-xenial - roles: - - bindep - - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - # In cases where zuul-cloner is aborted during a git - # clone operation, git will remove the git work tree in - # its cleanup. The work tree in these jobs is the - # workspace directory, which means that subsequent - # jenkins post-build actions can not run because the - # workspace has been removed. - # To reduce the likelihood of this having an impact, - # recreate the workspace directory if needed - mkdir -p $WORKSPACE - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - https://opendev.org $ZUUL_PROJECT - executable: /bin/bash - 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: | - set -e - set -x - /usr/local/jenkins/slave_scripts/version-properties.sh - source version.properties - mvn clean package -B -Dproject-version=$PROJECT_VER - 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 5d94caf3..b6c0f103 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -47,19 +47,6 @@ run: playbooks/legacy/monasca-common-maven-build/run.yaml timeout: 1800 -- job: - name: legacy-monasca-thresh-localrepo-upload - parent: legacy-publish-openstack-artifacts - run: playbooks/legacy/monasca-thresh-localrepo-upload/run.yaml - post-run: playbooks/legacy/monasca-thresh-localrepo-upload/post.yaml - timeout: 1800 - -- job: - name: legacy-monasca-thresh-maven-build - parent: legacy-base - run: playbooks/legacy/monasca-thresh-maven-build/run.yaml - timeout: 1800 - - job: name: legacy-tempest-dsvm-monasca-transform-python35-functional parent: legacy-dsvm-base