diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/post.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/post.yaml
+++ /dev/null
@@ -1,15 +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=/logs/**
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml
deleted file mode 100644
index 2b2a3bc8..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-dib-dsvm-functests-python2-centos-7-extras from old
- job gate-dib-dsvm-functests-python2-centos-7-extras-nv
- tasks:
-
- - name: Ensure legacy workspace directory
- file:
- path: '{{ ansible_user_dir }}/workspace'
- state: directory
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- cd ~
-
- /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
- git://git.openstack.org \
- openstack/diskimage-builder \
- openstack/requirements
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- cd ~/openstack/diskimage-builder
- /usr/local/jenkins/slave_scripts/install-distro-packages.sh
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- #
- # We do things that might exceed the default 2GiB tmpfs, and
- # use the larger mounted space.
- cd ~
- sudo mkdir /opt/dib_cache
- sudo chown zuul:zuul /opt/dib_cache
- export DIB_NO_TMPFS=1
- export TMPDIR=/opt/dib_cache
-
- virtualenv -p python2 env
-
- export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
- sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
- ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
- # TODO(pabelanger): Remove once we migrated to bindep
- ./openstack/diskimage-builder/tests/install_test_deps.sh
-
- # This sets up some repo files pointing to the infra mirrors
- # which are used during test runs
- ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
- # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
- # build, unset it
- unset UPPER_CONSTRAINTS_FILE
-
- # activate the virtualenv so that any tools run by dib run
- # using the python inside it
- set +u
- source ./env/bin/activate
- set -u
-
- ./openstack/diskimage-builder/tests/run_functests.sh \
- gentoo/build-succeeds \
- debian-minimal/stable-vm
-
- set +u
- deactivate
- set -u
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/post.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/post.yaml
+++ /dev/null
@@ -1,15 +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=/logs/**
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml
deleted file mode 100644
index f54176ca..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-dib-dsvm-functests-python2-centos-7-image from old
- job gate-dib-dsvm-functests-python2-centos-7-image-nv
- tasks:
-
- - name: Ensure legacy workspace directory
- file:
- path: '{{ ansible_user_dir }}/workspace'
- state: directory
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- cd ~
-
- /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
- git://git.openstack.org \
- openstack/diskimage-builder \
- openstack/requirements
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- cd ~/openstack/diskimage-builder
- /usr/local/jenkins/slave_scripts/install-distro-packages.sh
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- #
- # We do things that might exceed the default 2GiB tmpfs, and
- # use the larger mounted space.
- cd ~
- sudo mkdir /opt/dib_cache
- sudo chown zuul:zuul /opt/dib_cache
- export DIB_NO_TMPFS=1
- export TMPDIR=/opt/dib_cache
-
- virtualenv -p python2 env
-
- export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
- sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
- ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
- # TODO(pabelanger): Remove once we migrated to bindep
- ./openstack/diskimage-builder/tests/install_test_deps.sh
-
- # This sets up some repo files pointing to the infra mirrors
- # which are used during test runs
- ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
- # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
- # build, unset it
- unset UPPER_CONSTRAINTS_FILE
-
- # activate the virtualenv so that any tools run by dib run
- # using the python inside it
- set +u
- source ./env/bin/activate
- set -u
- ./openstack/diskimage-builder/tests/run_functests.sh \
- centos7/build-succeeds \
- opensuse/build-succeeds \
- opensuse/opensuse423-build-succeeds \
- fedora/build-succeeds \
- ubuntu/trusty-build-succeeds \
- ubuntu/xenial-build-succeeds
-
- set +u
- deactivate
- set -u
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7/post.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7/post.yaml
+++ /dev/null
@@ -1,15 +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=/logs/**
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml
deleted file mode 100644
index 3ea53443..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-dib-dsvm-functests-python2-centos-7 from old job
- gate-dib-dsvm-functests-python2-centos-7
- tasks:
-
- - name: Ensure legacy workspace directory
- file:
- path: '{{ ansible_user_dir }}/workspace'
- state: directory
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- cd ~
-
- /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
- git://git.openstack.org \
- openstack/diskimage-builder \
- openstack/requirements
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- cd ~/openstack/diskimage-builder
- /usr/local/jenkins/slave_scripts/install-distro-packages.sh
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- #
- # We do things that might exceed the default 2GiB tmpfs, and
- # use the larger mounted space.
- cd ~
- sudo mkdir /opt/dib_cache
- sudo chown zuul:zuul /opt/dib_cache
- export DIB_NO_TMPFS=1
- export TMPDIR=/opt/dib_cache
-
- virtualenv -p python2 env
-
- export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
- sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
- ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
- # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
- # build, unset it
- unset UPPER_CONSTRAINTS_FILE
-
- # TODO(pabelanger): Remove once we migrated to bindep
- ./openstack/diskimage-builder/tests/install_test_deps.sh
-
- # This sets up some repo files pointing to the infra mirrors
- # which are used during test runs
- ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
- # activate the virtualenv so that any tools run by dib run
- # using the python inside it
- set +u
- source ./env/bin/activate
- set -u
- ./openstack/diskimage-builder/tests/run_functests.sh
- set +u
- deactivate
- set -u
-
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/post.yaml b/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/post.yaml
+++ /dev/null
@@ -1,15 +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=/logs/**
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml
deleted file mode 100644
index ef67e2a9..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-dib-dsvm-functests-python2-opensuse-423 from old
- job gate-dib-dsvm-functests-python2-opensuse-423-nv
- tasks:
-
- - name: Ensure legacy workspace directory
- file:
- path: '{{ ansible_user_dir }}/workspace'
- state: directory
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- cd ~
-
- /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
- git://git.openstack.org \
- openstack/diskimage-builder \
- openstack/requirements
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- cd ~/openstack/diskimage-builder
- /usr/local/jenkins/slave_scripts/install-distro-packages.sh
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- #
- # We do things that might exceed the default 2GiB tmpfs, and
- # use the larger mounted space.
- cd ~
- sudo mkdir /opt/dib_cache
- sudo chown zuul:zuul /opt/dib_cache
- export DIB_NO_TMPFS=1
- export TMPDIR=/opt/dib_cache
-
- virtualenv -p python2 env
-
- export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
- sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
- ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
- # TODO(pabelanger): Remove once we migrated to bindep
- ./openstack/diskimage-builder/tests/install_test_deps.sh
-
- # This sets up some repo files pointing to the infra mirrors
- # which are used during test runs
- ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
- # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
- # build, unset it
- unset UPPER_CONSTRAINTS_FILE
-
- # activate the virtualenv so that any tools run by dib run
- # using the python inside it
- set +u
- source ./env/bin/activate
- set -u
-
- ./openstack/diskimage-builder/tests/run_functests.sh
-
- set +u
- deactivate
- set -u
-
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/post.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/post.yaml
+++ /dev/null
@@ -1,15 +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=/logs/**
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml
deleted file mode 100644
index da955d04..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-dib-dsvm-functests-python2-ubuntu-trusty-extras from
- old job gate-dib-dsvm-functests-python2-ubuntu-trusty-extras-nv
- tasks:
-
- - name: Ensure legacy workspace directory
- file:
- path: '{{ ansible_user_dir }}/workspace'
- state: directory
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- cd ~
-
- /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
- git://git.openstack.org \
- openstack/diskimage-builder \
- openstack/requirements
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- cd ~/openstack/diskimage-builder
- /usr/local/jenkins/slave_scripts/install-distro-packages.sh
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- #
- # We do things that might exceed the default 2GiB tmpfs, and
- # use the larger mounted space.
- cd ~
- sudo mkdir /opt/dib_cache
- sudo chown zuul:zuul /opt/dib_cache
- export DIB_NO_TMPFS=1
- export TMPDIR=/opt/dib_cache
-
- virtualenv -p python2 env
-
- export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
- sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
- ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
- # TODO(pabelanger): Remove once we migrated to bindep
- ./openstack/diskimage-builder/tests/install_test_deps.sh
-
- # This sets up some repo files pointing to the infra mirrors
- # which are used during test runs
- ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
- # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
- # build, unset it
- unset UPPER_CONSTRAINTS_FILE
-
- # activate the virtualenv so that any tools run by dib run
- # using the python inside it
- set +u
- source ./env/bin/activate
- set -u
-
- ./openstack/diskimage-builder/tests/run_functests.sh \
- gentoo/build-succeeds \
- debian-minimal/stable-vm
-
- set +u
- deactivate
- set -u
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/post.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/post.yaml
+++ /dev/null
@@ -1,15 +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=/logs/**
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml
deleted file mode 100644
index 736179dd..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-dib-dsvm-functests-python2-ubuntu-trusty-image from
- old job gate-dib-dsvm-functests-python2-ubuntu-trusty-image-nv
- tasks:
-
- - name: Ensure legacy workspace directory
- file:
- path: '{{ ansible_user_dir }}/workspace'
- state: directory
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- cd ~
-
- /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
- git://git.openstack.org \
- openstack/diskimage-builder \
- openstack/requirements
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- cd ~/openstack/diskimage-builder
- /usr/local/jenkins/slave_scripts/install-distro-packages.sh
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- #
- # We do things that might exceed the default 2GiB tmpfs, and
- # use the larger mounted space.
- cd ~
- sudo mkdir /opt/dib_cache
- sudo chown zuul:zuul /opt/dib_cache
- export DIB_NO_TMPFS=1
- export TMPDIR=/opt/dib_cache
-
- virtualenv -p python2 env
-
- export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
- sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
- ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
- # TODO(pabelanger): Remove once we migrated to bindep
- ./openstack/diskimage-builder/tests/install_test_deps.sh
-
- # This sets up some repo files pointing to the infra mirrors
- # which are used during test runs
- ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
- # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
- # build, unset it
- unset UPPER_CONSTRAINTS_FILE
-
- # activate the virtualenv so that any tools run by dib run
- # using the python inside it
- set +u
- source ./env/bin/activate
- set -u
-
- ./openstack/diskimage-builder/tests/run_functests.sh \
- centos7/build-succeeds \
- opensuse/build-succeeds \
- opensuse/opensuse423-build-succeeds \
- fedora/build-succeeds \
- ubuntu/trusty-build-succeeds \
- ubuntu/xenial-build-succeeds
-
- set +u
- deactivate
- set -u
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/post.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/post.yaml
+++ /dev/null
@@ -1,15 +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=/logs/**
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml
deleted file mode 100644
index 5ebe0bcd..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-dib-dsvm-functests-python2-ubuntu-trusty from old
- job gate-dib-dsvm-functests-python2-ubuntu-trusty
- tasks:
-
- - name: Ensure legacy workspace directory
- file:
- path: '{{ ansible_user_dir }}/workspace'
- state: directory
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- cd ~
-
- /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
- git://git.openstack.org \
- openstack/diskimage-builder \
- openstack/requirements
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- cd ~/openstack/diskimage-builder
- /usr/local/jenkins/slave_scripts/install-distro-packages.sh
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- #
- # We do things that might exceed the default 2GiB tmpfs, and
- # use the larger mounted space.
- cd ~
- sudo mkdir /opt/dib_cache
- sudo chown zuul:zuul /opt/dib_cache
- export DIB_NO_TMPFS=1
- export TMPDIR=/opt/dib_cache
-
- virtualenv -p python2 env
-
- export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
- sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
- ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
- # TODO(pabelanger): Remove once we migrated to bindep
- ./openstack/diskimage-builder/tests/install_test_deps.sh
-
- # This sets up some repo files pointing to the infra mirrors
- # which are used during test runs
- ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
- # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
- # build, unset it
- unset UPPER_CONSTRAINTS_FILE
-
- # activate the virtualenv so that any tools run by dib run
- # using the python inside it
- set +u
- source ./env/bin/activate
- set -u
-
- ./openstack/diskimage-builder/tests/run_functests.sh
-
- set +u
- deactivate
- set -u
-
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python3-extras/post.yaml b/playbooks/legacy/dib-dsvm-functests-python3-extras/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python3-extras/post.yaml
+++ /dev/null
@@ -1,15 +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=/logs/**
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
diff --git a/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml
deleted file mode 100644
index bb5c122f..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-dib-dsvm-functests-python3-extras from old job gate-dib-dsvm-functests-python3-ubuntu-xenial-extras-nv
- tasks:
-
- - name: Ensure legacy workspace directory
- file:
- path: '{{ ansible_user_dir }}/workspace'
- state: directory
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- cd ~
-
- /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
- git://git.openstack.org \
- openstack/diskimage-builder \
- openstack/requirements
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- cd ~/openstack/diskimage-builder
- /usr/local/jenkins/slave_scripts/install-distro-packages.sh
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- #
- # We do things that might exceed the default 2GiB tmpfs, and
- # use the larger mounted space.
- cd ~
- sudo mkdir /opt/dib_cache
- sudo chown zuul:zuul /opt/dib_cache
- export DIB_NO_TMPFS=1
- export TMPDIR=/opt/dib_cache
-
- virtualenv -p python3 env
-
- export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
- sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
- ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
- # TODO(pabelanger): Remove once we migrated to bindep
- ./openstack/diskimage-builder/tests/install_test_deps.sh
-
- # This sets up some repo files pointing to the infra mirrors
- # which are used during test runs
- ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
- # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
- # build, unset it
- unset UPPER_CONSTRAINTS_FILE
-
- # activate the virtualenv so that any tools run by dib run
- # using the python inside it
- set +u
- source ./env/bin/activate
- set -u
-
- ./openstack/diskimage-builder/tests/run_functests.sh \
- gentoo/build-succeeds \
- debian-minimal/stable-vm \
- opensuse-minimal/opensuse423-build-succeeds
-
- set +u
- deactivate
- set -u
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python3-image/post.yaml b/playbooks/legacy/dib-dsvm-functests-python3-image/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python3-image/post.yaml
+++ /dev/null
@@ -1,15 +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=/logs/**
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
diff --git a/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml
deleted file mode 100644
index 462b856a..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-dib-dsvm-functests-python3-image from old job gate-dib-dsvm-functests-python3-ubuntu-xenial-image-nv
- tasks:
-
- - name: Ensure legacy workspace directory
- file:
- path: '{{ ansible_user_dir }}/workspace'
- state: directory
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- cd ~
-
- /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
- git://git.openstack.org \
- openstack/diskimage-builder \
- openstack/requirements
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- cd ~/openstack/diskimage-builder
- /usr/local/jenkins/slave_scripts/install-distro-packages.sh
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- #
- # We do things that might exceed the default 2GiB tmpfs, and
- # use the larger mounted space.
- cd ~
- sudo mkdir /opt/dib_cache
- sudo chown zuul:zuul /opt/dib_cache
- export DIB_NO_TMPFS=1
- export TMPDIR=/opt/dib_cache
-
- virtualenv -p python3 env
-
- export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
- sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
- ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
- # TODO(pabelanger): Remove once we migrated to bindep
- ./openstack/diskimage-builder/tests/install_test_deps.sh
-
- # This sets up some repo files pointing to the infra mirrors
- # which are used during test runs
- ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
- # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
- # build, unset it
- unset UPPER_CONSTRAINTS_FILE
-
- # activate the virtualenv so that any tools run by dib run
- # using the python inside it
- set +u
- source ./env/bin/activate
- set -u
-
- ./openstack/diskimage-builder/tests/run_functests.sh \
- centos7/build-succeeds \
- opensuse/build-succeeds \
- opensuse/opensuse423-build-succeeds \
- fedora/build-succeeds \
- ubuntu/trusty-build-succeeds \
- ubuntu/xenial-build-succeeds
-
- set +u
- deactivate
- set -u
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/post.yaml b/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/post.yaml
+++ /dev/null
@@ -1,15 +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=/logs/**
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
diff --git a/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml
deleted file mode 100644
index 1d9de73c..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-dib-dsvm-functests-python3-opensuse-423 from old
- job gate-dib-dsvm-functests-python3-opensuse-423-nv
- tasks:
-
- - name: Ensure legacy workspace directory
- file:
- path: '{{ ansible_user_dir }}/workspace'
- state: directory
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- cd ~
-
- /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
- git://git.openstack.org \
- openstack/diskimage-builder \
- openstack/requirements
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- cd ~/openstack/diskimage-builder
- /usr/local/jenkins/slave_scripts/install-distro-packages.sh
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- #
- # We do things that might exceed the default 2GiB tmpfs, and
- # use the larger mounted space.
- cd ~
- sudo mkdir /opt/dib_cache
- sudo chown zuul:zuul /opt/dib_cache
- export DIB_NO_TMPFS=1
- export TMPDIR=/opt/dib_cache
-
- virtualenv -p python2 env
-
- export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
- sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
- ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
- # TODO(pabelanger): Remove once we migrated to bindep
- ./openstack/diskimage-builder/tests/install_test_deps.sh
-
- # This sets up some repo files pointing to the infra mirrors
- # which are used during test runs
- ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
- # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
- # build, unset it
- unset UPPER_CONSTRAINTS_FILE
-
- # activate the virtualenv so that any tools run by dib run
- # using the python inside it
- set +u
- source ./env/bin/activate
- set -u
-
- ./openstack/diskimage-builder/tests/run_functests.sh
-
- set +u
- deactivate
- set -u
-
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python3/post.yaml b/playbooks/legacy/dib-dsvm-functests-python3/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python3/post.yaml
+++ /dev/null
@@ -1,15 +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=/logs/**
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
diff --git a/playbooks/legacy/dib-dsvm-functests-python3/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3/run.yaml
deleted file mode 100644
index dff4d338..00000000
--- a/playbooks/legacy/dib-dsvm-functests-python3/run.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-dib-dsvm-functests-python3 from old job gate-dib-dsvm-functests-python3-ubuntu-xenial
- tasks:
-
- - name: Ensure legacy workspace directory
- file:
- path: '{{ ansible_user_dir }}/workspace'
- state: directory
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- cd ~
-
- /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
- git://git.openstack.org \
- openstack/diskimage-builder \
- openstack/requirements
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- cd ~/openstack/diskimage-builder
- /usr/local/jenkins/slave_scripts/install-distro-packages.sh
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -u
- set -e
- set -x
- #
- # We do things that might exceed the default 2GiB tmpfs, and
- # use the larger mounted space.
- cd ~
- sudo mkdir /opt/dib_cache
- sudo chown zuul:zuul /opt/dib_cache
- export DIB_NO_TMPFS=1
- export TMPDIR=/opt/dib_cache
-
- virtualenv -p python2 env
-
- export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
- sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
- ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
- # TODO(pabelanger): Remove once we migrated to bindep
- ./openstack/diskimage-builder/tests/install_test_deps.sh
-
- # This sets up some repo files pointing to the infra mirrors
- # which are used during test runs
- ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
- # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
- # build, unset it
- unset UPPER_CONSTRAINTS_FILE
-
- # activate the virtualenv so that any tools run by dib run
- # using the python inside it
- set +u
- source ./env/bin/activate
- set -u
-
- ./openstack/diskimage-builder/tests/run_functests.sh
-
- set +u
- deactivate
- set -u
-
- 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 b6bf2e5b..5448815b 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -1535,113 +1535,6 @@
required-projects:
- openstack-infra/devstack-gate
-- job:
- name: legacy-dib-dsvm-functests-python2-centos-7
- parent: legacy-dsvm-base
- run: playbooks/legacy/dib-dsvm-functests-python2-centos-7/run
- post-run: playbooks/legacy/dib-dsvm-functests-python2-centos-7/post
- timeout: 3600
- nodeset: legacy-centos-7
- required-projects:
- - openstack/diskimage-builder
-
-- job:
- name: legacy-dib-dsvm-functests-python2-centos-7-extras
- parent: legacy-dsvm-base
- run: playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run
- post-run: playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/post
- timeout: 3600
- nodeset: legacy-centos-7
- required-projects:
- - openstack/diskimage-builder
-
-- job:
- name: legacy-dib-dsvm-functests-python2-centos-7-image
- parent: legacy-dsvm-base
- run: playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run
- post-run: playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/post
- timeout: 3600
- nodeset: legacy-centos-7
- required-projects:
- - openstack/diskimage-builder
-
-- job:
- name: legacy-dib-dsvm-functests-python2-opensuse-423
- parent: legacy-dsvm-base
- run: playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run
- post-run: playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/post
- timeout: 3600
- nodeset: legacy-opensuse-423
- required-projects:
- - openstack/diskimage-builder
-
-- job:
- name: legacy-dib-dsvm-functests-python2-ubuntu-trusty
- parent: legacy-dsvm-base
- run: playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run
- post-run: playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/post
- timeout: 3600
- nodeset: legacy-ubuntu-trusty
- required-projects:
- - openstack/diskimage-builder
-
-- job:
- name: legacy-dib-dsvm-functests-python2-ubuntu-trusty-extras
- parent: legacy-dsvm-base
- run: playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run
- post-run: playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/post
- timeout: 3600
- nodeset: legacy-ubuntu-trusty
- required-projects:
- - openstack/diskimage-builder
-
-- job:
- name: legacy-dib-dsvm-functests-python2-ubuntu-trusty-image
- parent: legacy-dsvm-base
- run: playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run
- post-run: playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/post
- timeout: 3600
- nodeset: legacy-ubuntu-trusty
- required-projects:
- - openstack/diskimage-builder
-
-- job:
- name: legacy-dib-dsvm-functests-python3
- parent: legacy-dsvm-base
- run: playbooks/legacy/dib-dsvm-functests-python3/run
- post-run: playbooks/legacy/dib-dsvm-functests-python3/post
- timeout: 3600
- required-projects:
- - openstack/diskimage-builder
-
-- job:
- name: legacy-dib-dsvm-functests-python3-extras
- parent: legacy-dsvm-base
- run: playbooks/legacy/dib-dsvm-functests-python3-extras/run
- post-run: playbooks/legacy/dib-dsvm-functests-python3-extras/post
- timeout: 3600
- required-projects:
- - openstack/diskimage-builder
-
-- job:
- name: legacy-dib-dsvm-functests-python3-image
- parent: legacy-dsvm-base
- run: playbooks/legacy/dib-dsvm-functests-python3-image/run
- post-run: playbooks/legacy/dib-dsvm-functests-python3-image/post
- timeout: 3600
- required-projects:
- - openstack/diskimage-builder
-
-- job:
- name: legacy-dib-dsvm-functests-python3-opensuse-423
- parent: legacy-dsvm-base
- run: playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run
- post-run: playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/post
- timeout: 3600
- nodeset: legacy-opensuse-423
- required-projects:
- - openstack/diskimage-builder
-
- job:
name: legacy-dib-utils-tox-func
parent: legacy-base