diff --git a/playbooks/legacy/propose-requirements-constraints-master/run.yaml b/playbooks/legacy/propose-requirements-constraints-master/run.yaml
deleted file mode 100644
index ef93346d..00000000
--- a/playbooks/legacy/propose-requirements-constraints-master/run.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-propose-requirements-constraints-master from old
- job propose-requirements-constraints-master
- tasks:
-
- - name: Ensure legacy workspace directory
- file:
- path: '{{ ansible_user_dir }}/workspace'
- state: directory
-
- - 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
- export BRANCH=master
- CLONEMAP=`mktemp`
- function cleanup {
- 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 \
- --branch=$BRANCH \
- git://git.openstack.org $ZUUL_PROJECT
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- export ZUUL_REFNAME=master
- /usr/local/jenkins/slave_scripts/propose_update.sh \
- requirements-constraints
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/propose-update-constraints/post.yaml b/playbooks/legacy/propose-update-constraints/post.yaml
deleted file mode 100644
index 68fbdf81..00000000
--- a/playbooks/legacy/propose-update-constraints/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/propose-update-constraints/run.yaml b/playbooks/legacy/propose-update-constraints/run.yaml
deleted file mode 100644
index 3b110ce5..00000000
--- a/playbooks/legacy/propose-update-constraints/run.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-propose-update-constraints from old job propose-{name}-update-constraints
- 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 \
- git://git.openstack.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 -x
-
- # Save the version that was just tagged by parsing
- # ref/tags/VALUE to get VALUE.
- VERSION=$(echo $ZUUL_REF | cut -f3 -d/)
-
- /usr/local/jenkins/slave_scripts/release-tools/update_constraints.sh $VERSION
- 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 d64e5757..ddda5991 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -8381,22 +8381,6 @@
run: playbooks/legacy/project-team-guide-publish/run
timeout: 1800
-- job:
- name: legacy-propose-requirements-constraints-master
- parent: legacy-base
- branches: master
- run: playbooks/legacy/propose-requirements-constraints-master/run
- timeout: 1800
-
-- job:
- name: legacy-propose-update-constraints
- parent: legacy-base
- run: playbooks/legacy/propose-update-constraints/run
- post-run: playbooks/legacy/propose-update-constraints/post
- timeout: 1800
- dependencies:
- - legacy-pypi-both-upload
-
- job:
name: legacy-publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node
parent: legacy-dsvm-base-multinode