diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index a9902beb8..57e837c2b 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -98,16 +98,6 @@ required-projects: - openstack/diskimage-builder -- job: - name: dib-dsvm-functests-python2-opensuse-423 - parent: legacy-dsvm-base - run: playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml - post-run: playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/post.yaml - timeout: 3600 - nodeset: opensuse-423 - required-projects: - - openstack/diskimage-builder - - job: name: dib-dsvm-functests-python2-ubuntu-trusty parent: legacy-dsvm-base @@ -164,14 +154,3 @@ timeout: 3600 required-projects: - openstack/diskimage-builder - -- job: - name: dib-dsvm-functests-python3-opensuse-423 - parent: legacy-dsvm-base - run: playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml - post-run: playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/post.yaml - timeout: 3600 - nodeset: opensuse-423 - required-projects: - - openstack/diskimage-builder - 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 e07f5510a..000000000 --- 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 b3947d222..000000000 --- a/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml +++ /dev/null @@ -1,74 +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 - roles: - - bindep - - 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 -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-opensuse-423/post.yaml b/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/post.yaml deleted file mode 100644 index e07f5510a..000000000 --- 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 a9fc615e2..000000000 --- a/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml +++ /dev/null @@ -1,74 +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 - roles: - - bindep - - 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 -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 }}'