From 86d98666d72f3070ff8df8364baf4c6cd9c643a4 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Thu, 25 Oct 2018 14:13:42 -0700 Subject: [PATCH] zuul-ify primary IPA jobs Change-Id: I13312560389f8b1298dd62cedd654fb8f66d3dfe --- .../post.yaml | 15 --- .../run.yaml | 107 --------------- .../post.yaml | 15 --- .../run.yaml | 103 --------------- .../post.yaml | 15 --- .../run.yaml | 107 --------------- .../post.yaml | 15 --- .../run.yaml | 103 --------------- .../post.yaml | 15 --- .../run.yaml | 122 ------------------ zuul.d/ironic-jobs.yaml | 87 +++++++++++++ zuul.d/legacy-ironic-jobs.yaml | 39 ------ 12 files changed, 87 insertions(+), 656 deletions(-) delete mode 100644 playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src/post.yaml delete mode 100644 playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src/run.yaml delete mode 100644 playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src/post.yaml delete mode 100644 playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src/run.yaml delete mode 100644 playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src/post.yaml delete mode 100644 playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src/run.yaml delete mode 100644 playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src/post.yaml delete mode 100644 playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src/run.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-ironic-inspector-src/post.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-ironic-inspector-src/run.yaml create mode 100644 zuul.d/ironic-jobs.yaml diff --git a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src/post.yaml b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src/post.yaml deleted file mode 100644 index e07f5510a..000000000 --- a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-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/ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src/run.yaml b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src/run.yaml deleted file mode 100644 index 8e18665b5..000000000 --- a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src/run.yaml +++ /dev/null @@ -1,107 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-ironic-ipa-partition-bios-agent_ipmitool-tinyipa-src - from old job gate-tempest-dsvm-ironic-ipa-partition-bios-agent_ipmitool-tinyipa-src-ubuntu-xenial - 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: | - cat << 'EOF' >> ironic-extra-vars - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa" - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-extra-vars - export DEVSTACK_GATE_TEMPEST_REGEX="ironic_tempest_plugin.tests.scenario" - - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-vars-early - # use tempest plugin - export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'" - export TEMPEST_CONCURRENCY=1 - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PROJECTS="openstack/ironic $PROJECTS" - export PROJECTS="openstack/ironic-lib $PROJECTS" - export PROJECTS="openstack/ironic-python-agent $PROJECTS" - export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" - export PROJECTS="openstack/python-ironicclient $PROJECTS" - export PROJECTS="openstack/pyghmi $PROJECTS" - export PROJECTS="openstack/virtualbmc $PROJECTS" - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_IRONIC=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_VIRT_DRIVER=ironic - export DEVSTACK_GATE_CONFIGDRIVE=1 - export DEVSTACK_GATE_IRONIC_DRIVER=ipmi - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_DEPLOY_INTERFACE=direct" - # direct deploy requires Swift temporary URLs - export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_ENABLE_TEMPURLS=True" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_TEMPURL_KEY=secretkey" - - if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then - export DEVSTACK_GATE_TLSPROXY=1 - fi - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=False" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=1" - - export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=1 - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=True" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"USE_SUBNETPOOL=False" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=1" - - # Ensure the ironic-vars-EARLY file exists - touch ironic-vars-early - # Pull in the EARLY variables injected by the optional builders - source ironic-vars-early - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic" - - # Ensure the ironic-EXTRA-vars file exists - touch ironic-extra-vars - # Pull in the EXTRA variables injected by the optional builders - source ironic-extra-vars - - 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/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src/post.yaml b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src/post.yaml deleted file mode 100644 index e07f5510a..000000000 --- a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-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/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src/run.yaml b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src/run.yaml deleted file mode 100644 index 15776847c..000000000 --- a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src/run.yaml +++ /dev/null @@ -1,103 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-ironic-ipa-partition-bios-pxe_ipmitool-tinyipa-src - from old job gate-tempest-dsvm-ironic-ipa-partition-bios-pxe_ipmitool-tinyipa-src-ubuntu-xenial - 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: | - cat << 'EOF' >> ironic-extra-vars - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa" - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-extra-vars - export DEVSTACK_GATE_TEMPEST_REGEX="ironic_tempest_plugin.tests.scenario" - - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-vars-early - # use tempest plugin - export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'" - export TEMPEST_CONCURRENCY=1 - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PROJECTS="openstack/ironic $PROJECTS" - export PROJECTS="openstack/ironic-lib $PROJECTS" - export PROJECTS="openstack/ironic-python-agent $PROJECTS" - export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" - export PROJECTS="openstack/python-ironicclient $PROJECTS" - export PROJECTS="openstack/pyghmi $PROJECTS" - export PROJECTS="openstack/virtualbmc $PROJECTS" - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_IRONIC=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_VIRT_DRIVER=ironic - export DEVSTACK_GATE_CONFIGDRIVE=1 - export DEVSTACK_GATE_IRONIC_DRIVER=ipmi - - if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then - export DEVSTACK_GATE_TLSPROXY=1 - fi - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=False" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=1" - - export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=1 - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=True" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"USE_SUBNETPOOL=False" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=1" - - # Ensure the ironic-vars-EARLY file exists - touch ironic-vars-early - # Pull in the EARLY variables injected by the optional builders - source ironic-vars-early - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic" - - # Ensure the ironic-EXTRA-vars file exists - touch ironic-extra-vars - # Pull in the EXTRA variables injected by the optional builders - source ironic-extra-vars - - 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/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src/post.yaml b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src/post.yaml deleted file mode 100644 index e07f5510a..000000000 --- a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-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/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src/run.yaml b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src/run.yaml deleted file mode 100644 index f45ed298e..000000000 --- a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src/run.yaml +++ /dev/null @@ -1,107 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-ironic-ipa-wholedisk-bios-agent_ipmitool-tinyipa-src - from old job gate-tempest-dsvm-ironic-ipa-wholedisk-bios-agent_ipmitool-tinyipa-src-ubuntu-xenial - 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: | - cat << 'EOF' >> ironic-extra-vars - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa" - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-extra-vars - export DEVSTACK_GATE_TEMPEST_REGEX="ironic_tempest_plugin.tests.scenario" - - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-vars-early - # use tempest plugin - export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'" - export TEMPEST_CONCURRENCY=1 - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PROJECTS="openstack/ironic $PROJECTS" - export PROJECTS="openstack/ironic-lib $PROJECTS" - export PROJECTS="openstack/ironic-python-agent $PROJECTS" - export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" - export PROJECTS="openstack/python-ironicclient $PROJECTS" - export PROJECTS="openstack/pyghmi $PROJECTS" - export PROJECTS="openstack/virtualbmc $PROJECTS" - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_IRONIC=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_VIRT_DRIVER=ironic - export DEVSTACK_GATE_CONFIGDRIVE=1 - export DEVSTACK_GATE_IRONIC_DRIVER=ipmi - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_DEPLOY_INTERFACE=direct" - # direct deploy requires Swift temporary URLs - export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_ENABLE_TEMPURLS=True" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_TEMPURL_KEY=secretkey" - - if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then - export DEVSTACK_GATE_TLSPROXY=1 - fi - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=True" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=0" - - export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=1 - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=True" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"USE_SUBNETPOOL=False" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=1" - - # Ensure the ironic-vars-EARLY file exists - touch ironic-vars-early - # Pull in the EARLY variables injected by the optional builders - source ironic-vars-early - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic" - - # Ensure the ironic-EXTRA-vars file exists - touch ironic-extra-vars - # Pull in the EXTRA variables injected by the optional builders - source ironic-extra-vars - - 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/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src/post.yaml b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src/post.yaml deleted file mode 100644 index e07f5510a..000000000 --- a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-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/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src/run.yaml b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src/run.yaml deleted file mode 100644 index b0bf8e237..000000000 --- a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src/run.yaml +++ /dev/null @@ -1,103 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_ipmitool-tinyipa-src - from old job gate-tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_ipmitool-tinyipa-src-ubuntu-xenial - 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: | - cat << 'EOF' >> ironic-extra-vars - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa" - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-extra-vars - export DEVSTACK_GATE_TEMPEST_REGEX="ironic_tempest_plugin.tests.scenario" - - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-vars-early - # use tempest plugin - export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'" - export TEMPEST_CONCURRENCY=1 - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PROJECTS="openstack/ironic $PROJECTS" - export PROJECTS="openstack/ironic-lib $PROJECTS" - export PROJECTS="openstack/ironic-python-agent $PROJECTS" - export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" - export PROJECTS="openstack/python-ironicclient $PROJECTS" - export PROJECTS="openstack/pyghmi $PROJECTS" - export PROJECTS="openstack/virtualbmc $PROJECTS" - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_IRONIC=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_VIRT_DRIVER=ironic - export DEVSTACK_GATE_CONFIGDRIVE=1 - export DEVSTACK_GATE_IRONIC_DRIVER=ipmi - - if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then - export DEVSTACK_GATE_TLSPROXY=1 - fi - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=True" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=0" - - export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=1 - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=True" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"USE_SUBNETPOOL=False" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=1" - - # Ensure the ironic-vars-EARLY file exists - touch ironic-vars-early - # Pull in the EARLY variables injected by the optional builders - source ironic-vars-early - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic" - - # Ensure the ironic-EXTRA-vars file exists - touch ironic-extra-vars - # Pull in the EXTRA variables injected by the optional builders - source ironic-extra-vars - - 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/tempest-dsvm-ironic-inspector-src/post.yaml b/playbooks/legacy/tempest-dsvm-ironic-inspector-src/post.yaml deleted file mode 100644 index e07f5510a..000000000 --- a/playbooks/legacy/tempest-dsvm-ironic-inspector-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/tempest-dsvm-ironic-inspector-src/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-inspector-src/run.yaml deleted file mode 100644 index cf00cfe2b..000000000 --- a/playbooks/legacy/tempest-dsvm-ironic-inspector-src/run.yaml +++ /dev/null @@ -1,122 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-ironic-inspector-src from old job gate-tempest-dsvm-ironic-inspector-src-ubuntu-xenial-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: | - cat << 'EOF' >> ironic-extra-vars - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa" - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-extra-vars - export DEVSTACK_GATE_TEMPEST_REGEX="InspectorBasicTest" - - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-extra-vars - export PROJECTS="openstack/ironic-inspector $PROJECTS" - export PROJECTS="openstack/python-ironic-inspector-client $PROJECTS" - export DEVSTACK_GATE_IRONIC_INSPECTOR=1 - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector" - - # use tempest plugin - export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'" - - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-vars-early - # use tempest plugin - export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'" - export TEMPEST_CONCURRENCY=1 - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PROJECTS="openstack/ironic $PROJECTS" - export PROJECTS="openstack/ironic-lib $PROJECTS" - export PROJECTS="openstack/ironic-python-agent $PROJECTS" - export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" - export PROJECTS="openstack/python-ironicclient $PROJECTS" - export PROJECTS="openstack/pyghmi $PROJECTS" - export PROJECTS="openstack/virtualbmc $PROJECTS" - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_IRONIC=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_VIRT_DRIVER=ironic - export DEVSTACK_GATE_CONFIGDRIVE=1 - export DEVSTACK_GATE_IRONIC_DRIVER=ipmi - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_DEPLOY_INTERFACE=direct" - # direct deploy requires Swift temporary URLs - export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_ENABLE_TEMPURLS=True" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_TEMPURL_KEY=secretkey" - - if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then - export DEVSTACK_GATE_TLSPROXY=1 - fi - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=True" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=0" - - export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=1 - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=True" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"USE_SUBNETPOOL=False" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=1" - - # Ensure the ironic-vars-EARLY file exists - touch ironic-vars-early - # Pull in the EARLY variables injected by the optional builders - source ironic-vars-early - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic" - - # Ensure the ironic-EXTRA-vars file exists - touch ironic-extra-vars - # Pull in the EXTRA variables injected by the optional builders - source ironic-extra-vars - - 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/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml new file mode 100644 index 000000000..07ec82ce5 --- /dev/null +++ b/zuul.d/ironic-jobs.yaml @@ -0,0 +1,87 @@ +- job: + name: ironic-ipa-base + parent: ironic-base + irrelevant-files: + - ^test-requirements.txt$ + - ^.*\.rst$ + - ^doc/.*$ + - ^ironic_python_agent/tests/.*$ + - ^releasenotes/.*$ + - ^setup.cfg$ + - ^tools/.*$ + - ^tox.ini$ + required-projects: + - openstack/ironic-lib + vars: + devstack_localrc: + IRONIC_BUILD_DEPLOY_RAMDISK: True + USE_PYTHON3: True + +- job: + name: ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src + parent: ironic-ipa-base + timeout: 7200 + vars: + devstack_services: + s-account: True + s-container: True + s-object: True + s-proxy: True + devstack_localrc: + IRONIC_DEPLOY_DRIVER: ipmi + IRONIC_DEFAULT_DEPLOY_INTERFACE: direct + IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True + USE_PYTHON3: False + IRONIC_VM_EPHEMERAL_DISK: 0 + +- job: + name: ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src + parent: ironic-ipa-base + timeout: 7200 + vars: + devstack_services: + s-account: True + s-container: True + s-object: True + s-proxy: True + devstack_localrc: + IRONIC_DEPLOY_DRIVER: ipmi + IRONIC_DEFAULT_DEPLOY_INTERFACE: direct + USE_PYTHON3: False + +- job: + name: ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src + parent: ironic-ipa-base + timeout: 7200 + vars: + IRONIC_DEPLOY_DRIVER: ipmi + IRONIC_DEFAULT_DEPLOY_INTERFACE: iscsi + +- job: + name: ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src + parent: ironic-ipa-base + timeout: 7200 + vars: + devstack_localrc: + IRONIC_DEPLOY_DRIVER: ipmi + IRONIC_DEFAULT_DEPLOY_INTERFACE: iscsi + IRONIC_VM_EPHEMERAL_DISK: 0 + IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True + +- job: + name: ipa-tempest-dsvm-ironic-inspector-src + parent: ironic-ipa-base + timeout: 10800 + required-projects: + # These are in addition to what is in ironic-ipa-base + - openstack/ironic-inspector + - openstack/python-ironic-inspector-client + vars: + devstack_localrc: + DEVSTACK_GATE_TEMPEST_REGEX: InspectorBasicTest + DEVSTACK_GATE_IRONIC_INSPECTOR: 1 + IRONIC_VM_EPHEMERAL_DISK: 0 + IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True + IRONIC_INSPECTOR_BUILD_RAMDISK: True + devstack_plugins: + ironic-inspector: git://git.openstack.org/openstack/ironic-inspector diff --git a/zuul.d/legacy-ironic-jobs.yaml b/zuul.d/legacy-ironic-jobs.yaml index 328ec5d24..cc5242db0 100644 --- a/zuul.d/legacy-ironic-jobs.yaml +++ b/zuul.d/legacy-ironic-jobs.yaml @@ -37,34 +37,6 @@ post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-coreos-src/post.yaml timeout: 5400 -- job: - name: ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src - parent: legacy-ipa-dsvm-base - run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src/run.yaml - post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src/post.yaml - timeout: 7200 - -- job: - name: ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src - parent: legacy-ipa-dsvm-base - run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src/run.yaml - post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src/post.yaml - timeout: 7200 - -- job: - name: ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src - parent: legacy-ipa-dsvm-base - run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src/run.yaml - post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src/post.yaml - timeout: 7200 - -- job: - name: ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src - parent: legacy-ipa-dsvm-base - run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src/run.yaml - post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src/post.yaml - timeout: 7200 - - job: name: ipa-tempest-dsvm-partition-bios-ipmi-iscsi-coreos-src parent: legacy-ipa-dsvm-base @@ -79,17 +51,6 @@ post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-coreos-src/post.yaml timeout: 7200 -- job: - name: ipa-tempest-dsvm-ironic-inspector-src - parent: legacy-ipa-dsvm-base - run: playbooks/legacy/tempest-dsvm-ironic-inspector-src/run.yaml - post-run: playbooks/legacy/tempest-dsvm-ironic-inspector-src/post.yaml - timeout: 10800 - required-projects: - # These are in addition to what is in legacy-ipa-dsvm-base - - openstack/ironic-inspector - - openstack/python-ironic-inspector-client - - job: name: ironic-python-agent-buildimage-coreos parent: legacy-publish-openstack-artifacts