From 34c8f01a70dc7f0eca7aa5bb2228665d7d4cd24d Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 12 Feb 2018 14:09:11 +1100 Subject: [PATCH] Remove legacy nodepool boot jobs These have all moved in-tree Change-Id: I758439c2a6af6865c1dee926a77999c2e1b9c9be Depends-On: https://review.openstack.org/543329 --- .../legacy/dsvm-nodepool-debian-src/post.yaml | 15 --- .../legacy/dsvm-nodepool-debian-src/run.yaml | 121 ------------------ .../dsvm-nodepool-opensuse-src/post.yaml | 15 --- .../dsvm-nodepool-opensuse-src/run.yaml | 121 ------------------ .../legacy/dsvm-nodepool-redhat-src/post.yaml | 15 --- .../legacy/dsvm-nodepool-redhat-src/run.yaml | 121 ------------------ .../legacy/dsvm-nodepool-ubuntu-src/post.yaml | 15 --- .../legacy/dsvm-nodepool-ubuntu-src/run.yaml | 121 ------------------ zuul.d/zuul-legacy-jobs.yaml | 52 -------- 9 files changed, 596 deletions(-) delete mode 100644 playbooks/legacy/dsvm-nodepool-debian-src/post.yaml delete mode 100644 playbooks/legacy/dsvm-nodepool-debian-src/run.yaml delete mode 100644 playbooks/legacy/dsvm-nodepool-opensuse-src/post.yaml delete mode 100644 playbooks/legacy/dsvm-nodepool-opensuse-src/run.yaml delete mode 100644 playbooks/legacy/dsvm-nodepool-redhat-src/post.yaml delete mode 100644 playbooks/legacy/dsvm-nodepool-redhat-src/run.yaml delete mode 100644 playbooks/legacy/dsvm-nodepool-ubuntu-src/post.yaml delete mode 100644 playbooks/legacy/dsvm-nodepool-ubuntu-src/run.yaml diff --git a/playbooks/legacy/dsvm-nodepool-debian-src/post.yaml b/playbooks/legacy/dsvm-nodepool-debian-src/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/dsvm-nodepool-debian-src/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/dsvm-nodepool-debian-src/run.yaml b/playbooks/legacy/dsvm-nodepool-debian-src/run.yaml deleted file mode 100644 index 9952e48c..00000000 --- a/playbooks/legacy/dsvm-nodepool-debian-src/run.yaml +++ /dev/null @@ -1,121 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-dsvm-nodepool-debian-src from old job gate-dsvm-nodepool-debian-src-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - # Disable tempest as nodepool is talking to the cloud not tempest. - export DEVSTACK_GATE_TEMPEST=0 - # Use neutron as the public clouds in use are neutron based. - export DEVSTACK_GATE_NEUTRON=1 - # The nodepool process needs sudo rights in order to - # perform dib image builds - export DEVSTACK_GATE_REMOVE_STACK_SUDO=0 - # Disable services we do not need for nodepool - export DEVSTACK_LOCAL_CONFIG="disable_service horizon" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acentral" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acompute" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-evaluator" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-notifier" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-anotification" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service cinder" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-bak" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-sch" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-api" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-vol" - - if [ "" == "-py35" ]; then - export DEVSTACK_GATE_USE_PYTHON3=True - - # swift is not ready for python3 yet - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-object" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-proxy" - fi - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - # Because we are testing a non standard project, add the - # our project repository. This makes zuul do the right - # reference magic for testing changes. - export PROJECTS="openstack-infra/nodepool $PROJECTS" - # note the actual url here is somewhat irrelevant because it - # caches in nodepool, however make it a valid url for - # documentation purposes. - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin nodepool git://git.openstack.org/openstack-infra/nodepool" - export DEVSTACK_PROJECT_FROM_GIT="diskimage-builder" - export DEVSTACK_PROJECT_FROM_GIT+=",glean" - export DEVSTACK_PROJECT_FROM_GIT+=",shade" - - # Start with all images disabled. - export NODEPOOL_PAUSE_CENTOS_7_DIB=true - export NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=true - export NODEPOOL_PAUSE_FEDORA_26_DIB=true - export NODEPOOL_PAUSE_OPENSUSE_423_DIB=true - export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true - export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=true - - if [ "-debian" == "" ] ; then - # dsvm-nodepool-src - export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false - elif [ "-debian" == "-debian" ] ; then - # dsvm-nodepool-debian-src - export NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=false - elif [ "-debian" == "-opensuse" ] ; then - # dsvm-nodepool-opensuse-src - export NODEPOOL_PAUSE_OPENSUSE_423_DIB=false - elif [ "-debian" == "-redhat" ] ; then - # dsvm-nodepool-redhat-src - export NODEPOOL_PAUSE_CENTOS_7_DIB=false - export NODEPOOL_PAUSE_FEDORA_26_DIB=false - elif [ "-debian" == "-ubuntu" ] ; then - # dsvm-nodepool-ubuntu-src - export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false - export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=false - fi - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=$NODEPOOL_PAUSE_CENTOS_7_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=$NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_26_DIB=$NODEPOOL_PAUSE_FEDORA_26_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_OPENSUSE_423_DIB=$NODEPOOL_PAUSE_OPENSUSE_423_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=$NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=$NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB" - - function post_test_hook { - /opt/stack/new/nodepool/tools/check_devstack_plugin.sh - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/dsvm-nodepool-opensuse-src/post.yaml b/playbooks/legacy/dsvm-nodepool-opensuse-src/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/dsvm-nodepool-opensuse-src/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/dsvm-nodepool-opensuse-src/run.yaml b/playbooks/legacy/dsvm-nodepool-opensuse-src/run.yaml deleted file mode 100644 index f46e65d3..00000000 --- a/playbooks/legacy/dsvm-nodepool-opensuse-src/run.yaml +++ /dev/null @@ -1,121 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-dsvm-nodepool-opensuse-src from old job gate-dsvm-nodepool-opensuse-src - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - # Disable tempest as nodepool is talking to the cloud not tempest. - export DEVSTACK_GATE_TEMPEST=0 - # Use neutron as the public clouds in use are neutron based. - export DEVSTACK_GATE_NEUTRON=1 - # The nodepool process needs sudo rights in order to - # perform dib image builds - export DEVSTACK_GATE_REMOVE_STACK_SUDO=0 - # Disable services we do not need for nodepool - export DEVSTACK_LOCAL_CONFIG="disable_service horizon" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acentral" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acompute" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-evaluator" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-notifier" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-anotification" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service cinder" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-bak" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-sch" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-api" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-vol" - - if [ "" == "-py35" ]; then - export DEVSTACK_GATE_USE_PYTHON3=True - - # swift is not ready for python3 yet - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-object" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-proxy" - fi - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - # Because we are testing a non standard project, add the - # our project repository. This makes zuul do the right - # reference magic for testing changes. - export PROJECTS="openstack-infra/nodepool $PROJECTS" - # note the actual url here is somewhat irrelevant because it - # caches in nodepool, however make it a valid url for - # documentation purposes. - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin nodepool git://git.openstack.org/openstack-infra/nodepool" - export DEVSTACK_PROJECT_FROM_GIT="diskimage-builder" - export DEVSTACK_PROJECT_FROM_GIT+=",glean" - export DEVSTACK_PROJECT_FROM_GIT+=",shade" - - # Start with all images disabled. - export NODEPOOL_PAUSE_CENTOS_7_DIB=true - export NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=true - export NODEPOOL_PAUSE_FEDORA_26_DIB=true - export NODEPOOL_PAUSE_OPENSUSE_423_DIB=true - export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true - export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=true - - if [ "-opensuse" == "" ] ; then - # dsvm-nodepool-src - export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false - elif [ "-opensuse" == "-debian" ] ; then - # dsvm-nodepool-debian-src - export NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=false - elif [ "-opensuse" == "-opensuse" ] ; then - # dsvm-nodepool-opensuse-src - export NODEPOOL_PAUSE_OPENSUSE_423_DIB=false - elif [ "-opensuse" == "-redhat" ] ; then - # dsvm-nodepool-redhat-src - export NODEPOOL_PAUSE_CENTOS_7_DIB=false - export NODEPOOL_PAUSE_FEDORA_26_DIB=false - elif [ "-opensuse" == "-ubuntu" ] ; then - # dsvm-nodepool-ubuntu-src - export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false - export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=false - fi - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=$NODEPOOL_PAUSE_CENTOS_7_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=$NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_26_DIB=$NODEPOOL_PAUSE_FEDORA_26_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_OPENSUSE_423_DIB=$NODEPOOL_PAUSE_OPENSUSE_423_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=$NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=$NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB" - - function post_test_hook { - /opt/stack/new/nodepool/tools/check_devstack_plugin.sh - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/dsvm-nodepool-redhat-src/post.yaml b/playbooks/legacy/dsvm-nodepool-redhat-src/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/dsvm-nodepool-redhat-src/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/dsvm-nodepool-redhat-src/run.yaml b/playbooks/legacy/dsvm-nodepool-redhat-src/run.yaml deleted file mode 100644 index 25cf2cc2..00000000 --- a/playbooks/legacy/dsvm-nodepool-redhat-src/run.yaml +++ /dev/null @@ -1,121 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-dsvm-nodepool-redhat-src from old job gate-dsvm-nodepool-redhat-src - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - # Disable tempest as nodepool is talking to the cloud not tempest. - export DEVSTACK_GATE_TEMPEST=0 - # Use neutron as the public clouds in use are neutron based. - export DEVSTACK_GATE_NEUTRON=1 - # The nodepool process needs sudo rights in order to - # perform dib image builds - export DEVSTACK_GATE_REMOVE_STACK_SUDO=0 - # Disable services we do not need for nodepool - export DEVSTACK_LOCAL_CONFIG="disable_service horizon" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acentral" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acompute" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-evaluator" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-notifier" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-anotification" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service cinder" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-bak" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-sch" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-api" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-vol" - - if [ "" == "-py35" ]; then - export DEVSTACK_GATE_USE_PYTHON3=True - - # swift is not ready for python3 yet - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-object" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-proxy" - fi - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - # Because we are testing a non standard project, add the - # our project repository. This makes zuul do the right - # reference magic for testing changes. - export PROJECTS="openstack-infra/nodepool $PROJECTS" - # note the actual url here is somewhat irrelevant because it - # caches in nodepool, however make it a valid url for - # documentation purposes. - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin nodepool git://git.openstack.org/openstack-infra/nodepool" - export DEVSTACK_PROJECT_FROM_GIT="diskimage-builder" - export DEVSTACK_PROJECT_FROM_GIT+=",glean" - export DEVSTACK_PROJECT_FROM_GIT+=",shade" - - # Start with all images disabled. - export NODEPOOL_PAUSE_CENTOS_7_DIB=true - export NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=true - export NODEPOOL_PAUSE_FEDORA_26_DIB=true - export NODEPOOL_PAUSE_OPENSUSE_423_DIB=true - export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true - export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=true - - if [ "-redhat" == "" ] ; then - # dsvm-nodepool-src - export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false - elif [ "-redhat" == "-debian" ] ; then - # dsvm-nodepool-debian-src - export NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=false - elif [ "-redhat" == "-opensuse" ] ; then - # dsvm-nodepool-opensuse-src - export NODEPOOL_PAUSE_OPENSUSE_423_DIB=false - elif [ "-redhat" == "-redhat" ] ; then - # dsvm-nodepool-redhat-src - export NODEPOOL_PAUSE_CENTOS_7_DIB=false - export NODEPOOL_PAUSE_FEDORA_26_DIB=false - elif [ "-redhat" == "-ubuntu" ] ; then - # dsvm-nodepool-ubuntu-src - export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false - export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=false - fi - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=$NODEPOOL_PAUSE_CENTOS_7_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=$NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_26_DIB=$NODEPOOL_PAUSE_FEDORA_26_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_OPENSUSE_423_DIB=$NODEPOOL_PAUSE_OPENSUSE_423_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=$NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=$NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB" - - function post_test_hook { - /opt/stack/new/nodepool/tools/check_devstack_plugin.sh - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/dsvm-nodepool-ubuntu-src/post.yaml b/playbooks/legacy/dsvm-nodepool-ubuntu-src/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/dsvm-nodepool-ubuntu-src/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/dsvm-nodepool-ubuntu-src/run.yaml b/playbooks/legacy/dsvm-nodepool-ubuntu-src/run.yaml deleted file mode 100644 index 94ece213..00000000 --- a/playbooks/legacy/dsvm-nodepool-ubuntu-src/run.yaml +++ /dev/null @@ -1,121 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-dsvm-nodepool-ubuntu-src from old job gate-dsvm-nodepool-ubuntu-src - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - # Disable tempest as nodepool is talking to the cloud not tempest. - export DEVSTACK_GATE_TEMPEST=0 - # Use neutron as the public clouds in use are neutron based. - export DEVSTACK_GATE_NEUTRON=1 - # The nodepool process needs sudo rights in order to - # perform dib image builds - export DEVSTACK_GATE_REMOVE_STACK_SUDO=0 - # Disable services we do not need for nodepool - export DEVSTACK_LOCAL_CONFIG="disable_service horizon" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acentral" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acompute" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-evaluator" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-notifier" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-anotification" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service cinder" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-bak" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-sch" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-api" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service c-vol" - - if [ "" == "-py35" ]; then - export DEVSTACK_GATE_USE_PYTHON3=True - - # swift is not ready for python3 yet - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-object" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-proxy" - fi - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - # Because we are testing a non standard project, add the - # our project repository. This makes zuul do the right - # reference magic for testing changes. - export PROJECTS="openstack-infra/nodepool $PROJECTS" - # note the actual url here is somewhat irrelevant because it - # caches in nodepool, however make it a valid url for - # documentation purposes. - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin nodepool git://git.openstack.org/openstack-infra/nodepool" - export DEVSTACK_PROJECT_FROM_GIT="diskimage-builder" - export DEVSTACK_PROJECT_FROM_GIT+=",glean" - export DEVSTACK_PROJECT_FROM_GIT+=",shade" - - # Start with all images disabled. - export NODEPOOL_PAUSE_CENTOS_7_DIB=true - export NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=true - export NODEPOOL_PAUSE_FEDORA_26_DIB=true - export NODEPOOL_PAUSE_OPENSUSE_423_DIB=true - export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true - export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=true - - if [ "-ubuntu" == "" ] ; then - # dsvm-nodepool-src - export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false - elif [ "-ubuntu" == "-debian" ] ; then - # dsvm-nodepool-debian-src - export NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=false - elif [ "-ubuntu" == "-opensuse" ] ; then - # dsvm-nodepool-opensuse-src - export NODEPOOL_PAUSE_OPENSUSE_423_DIB=false - elif [ "-ubuntu" == "-redhat" ] ; then - # dsvm-nodepool-redhat-src - export NODEPOOL_PAUSE_CENTOS_7_DIB=false - export NODEPOOL_PAUSE_FEDORA_26_DIB=false - elif [ "-ubuntu" == "-ubuntu" ] ; then - # dsvm-nodepool-ubuntu-src - export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false - export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=false - fi - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=$NODEPOOL_PAUSE_CENTOS_7_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=$NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_26_DIB=$NODEPOOL_PAUSE_FEDORA_26_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_OPENSUSE_423_DIB=$NODEPOOL_PAUSE_OPENSUSE_423_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=$NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=$NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB" - - function post_test_hook { - /opt/stack/new/nodepool/tools/check_devstack_plugin.sh - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - 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 20b6c178..e5a903ef 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -226,58 +226,6 @@ post-run: playbooks/legacy/dox-buildimages/post.yaml timeout: 5400 -- job: - name: legacy-dsvm-nodepool-debian-src - parent: legacy-dsvm-base - run: playbooks/legacy/dsvm-nodepool-debian-src/run.yaml - post-run: playbooks/legacy/dsvm-nodepool-debian-src/post.yaml - timeout: 5400 - required-projects: - - openstack-infra/devstack-gate - - openstack-infra/glean - - openstack-infra/nodepool - - openstack-infra/shade - - openstack/diskimage-builder - -- job: - name: legacy-dsvm-nodepool-opensuse-src - parent: legacy-dsvm-base - run: playbooks/legacy/dsvm-nodepool-opensuse-src/run.yaml - post-run: playbooks/legacy/dsvm-nodepool-opensuse-src/post.yaml - timeout: 5400 - required-projects: - - openstack-infra/devstack-gate - - openstack-infra/glean - - openstack-infra/nodepool - - openstack-infra/shade - - openstack/diskimage-builder - -- job: - name: legacy-dsvm-nodepool-redhat-src - parent: legacy-dsvm-base - run: playbooks/legacy/dsvm-nodepool-redhat-src/run.yaml - post-run: playbooks/legacy/dsvm-nodepool-redhat-src/post.yaml - timeout: 5400 - required-projects: - - openstack-infra/devstack-gate - - openstack-infra/glean - - openstack-infra/nodepool - - openstack-infra/shade - - openstack/diskimage-builder - -- job: - name: legacy-dsvm-nodepool-ubuntu-src - parent: legacy-dsvm-base - run: playbooks/legacy/dsvm-nodepool-ubuntu-src/run.yaml - post-run: playbooks/legacy/dsvm-nodepool-ubuntu-src/post.yaml - timeout: 5400 - required-projects: - - openstack-infra/devstack-gate - - openstack-infra/glean - - openstack-infra/nodepool - - openstack-infra/shade - - openstack/diskimage-builder - - job: name: legacy-dsvm-os-loganalyze parent: legacy-dsvm-base