From 02c6c92c50c8c55347cb02138781a57e8b976850 Mon Sep 17 00:00:00 2001 From: Iury Gregory Melo Ferreira Date: Thu, 23 Jan 2020 14:14:30 +0100 Subject: [PATCH] Native zuulv3 grenade job for inspector Based on the native 'grenade' job Depends-On: https://review.opendev.org/548936 Change-Id: I606f8ffed0defe4ebc7fc2ceda1f6853c36a1b05 --- doc/source/contributor/jobs-description.rst | 2 +- .../ironic-inspector-grenade-dsvm/post.yaml | 15 -- .../ironic-inspector-grenade-dsvm/run.yaml | 145 ------------------ zuul.d/ironic-inspector-jobs.yaml | 71 +++++++++ zuul.d/legacy-ironic-inspector-jobs.yaml | 29 ---- zuul.d/project.yaml | 4 +- 6 files changed, 74 insertions(+), 192 deletions(-) delete mode 100644 playbooks/legacy/ironic-inspector-grenade-dsvm/post.yaml delete mode 100644 playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml delete mode 100644 zuul.d/legacy-ironic-inspector-jobs.yaml diff --git a/doc/source/contributor/jobs-description.rst b/doc/source/contributor/jobs-description.rst index 22de1b7ec..5f5080b16 100644 --- a/doc/source/contributor/jobs-description.rst +++ b/doc/source/contributor/jobs-description.rst @@ -19,7 +19,7 @@ The description of each jobs that runs in the CI when you submit a patch for * - Job name - Description - * - ironic-inspector-grenade-dsvm + * - ironic-inspector-grenade - Deploys Ironic and Ironic Inspector in DevStack and runs upgrade for all enabled services. * - ironic-inspector-tempest diff --git a/playbooks/legacy/ironic-inspector-grenade-dsvm/post.yaml b/playbooks/legacy/ironic-inspector-grenade-dsvm/post.yaml deleted file mode 100644 index e07f5510a..000000000 --- a/playbooks/legacy/ironic-inspector-grenade-dsvm/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/ironic-inspector-grenade-dsvm/run.yaml b/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml deleted file mode 100644 index cb35ae0c4..000000000 --- a/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml +++ /dev/null @@ -1,145 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-grenade-dsvm-ironic-inspector from old job gate-grenade-dsvm-ironic-inspector-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/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-vars-early - # Set this early so that we do not have to be as careful with builder ordering in jobs. - export GRENADE_PLUGINRC="enable_grenade_plugin ironic https://opendev.org/openstack/ironic" - - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-extra-vars - export PROJECTS="openstack/grenade $PROJECTS" - export DEVSTACK_GATE_GRENADE=pullup - export DEVSTACK_GATE_OS_TEST_TIMEOUT=2400 - export DEVSTACK_GATE_TIMEOUT=240 - export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200 - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BUILD_DEPLOY_RAMDISK=False" - export DEVSTACK_GATE_TLSPROXY=0 - export DEVSTACK_GATE_USE_PYTHON3=True - - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-extra-vars - export GRENADE_PLUGINRC+=$'\n'"enable_grenade_plugin ironic-inspector https://opendev.org/openstack/ironic-inspector" - - EOF - 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-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: | - cat << 'EOF' >> ironic-extra-vars - export PROJECTS="openstack/ironic-inspector $PROJECTS" - export DEVSTACK_GATE_IRONIC_INSPECTOR=1 - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector https://opendev.org/openstack/ironic-inspector" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_DHCP_FILTER=iptables" - - 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-tempest-plugin $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=iscsi" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_BOOT_OPTION=netboot" - - export BRANCH_OVERRIDE="{{ zuul.override_checkout | default('default') }}" - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - if [[ "$ZUUL_BRANCH" != "stable/ocata" && "$BRANCH_OVERRIDE" != "stable/ocata" ]]; 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=0 - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=False" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=7" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_AUTOMATED_CLEAN_ENABLED=False" - - # 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 https://opendev.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-inspector-jobs.yaml b/zuul.d/ironic-inspector-jobs.yaml index b055af6ab..c662213e8 100644 --- a/zuul.d/ironic-inspector-jobs.yaml +++ b/zuul.d/ironic-inspector-jobs.yaml @@ -105,3 +105,74 @@ - ^test-requirements.txt$ - ^setup.cfg$ - ^tox.ini$ + +- job: + name: ironic-inspector-grenade + parent: grenade + timeout: 10800 + required-projects: + - openstack/grenade + - openstack/ironic + - openstack/ironic-inspector + - openstack/ironic-tempest-plugin + - openstack/virtualbmc + vars: + grenade_devstack_localrc: + shared: + DEFAULT_INSTANCE_TYPE: baremetal + FORCE_CONFIG_DRIVE: True + INSTALL_TEMPEST: False + VIRT_DRIVER: ironic + BUILD_TIMEOUT: 1200 + IRONIC_DEFAULT_DEPLOY_INTERFACE: iscsi + IRONIC_BAREMETAL_BASIC_OPS: True + IRONIC_BUILD_DEPLOY_RAMDISK: False + IRONIC_CALLBACK_TIMEOUT: 600 + IRONIC_DEPLOY_DRIVER: ipmi + IRONIC_DEFAULT_BOOT_OPTION: netboot + IRONIC_INSPECTOR_BUILD_RAMDISK: False + IRONIC_RAMDISK_TYPE: tinyipa + IRONIC_TEMPEST_WHOLE_DISK_IMAGE: False + IRONIC_VM_COUNT: 7 + IRONIC_VM_EPHEMERAL_DISK: 1 + IRONIC_VM_SPECS_RAM: 384 + IRONIC_AUTOMATED_CLEAN_ENABLED: False + IRONIC_INSPECTOR_DHCP_FILTER: iptables + Q_AGENT: openvswitch + Q_ML2_TENANT_NETWORK_TYPE: vxlan + EBTABLES_RACE_FIX: True + old: + IRONIC_VM_LOG_DIR: '{{ devstack_bases.old }}/ironic-bm-logs' + grenade_tempest_concurrency: 1 + grenade_test_timeout: 2400 + devstack_plugins: + ironic: https://opendev.org/openstack/ironic + ironic-inspector: https://opendev.org/openstack/ironic-inspector + devstack_services: + c-api: False + c-bak: False + c-sch: False + c-vol: False + cinder: False + ir-api: True + ir-cond: True + ironic-inspector-dhcp: True + ironic-inspector: True + tempest_plugins: + - ironic-tempest-plugin + tempest_test_regex: smoke + tox_envlist: all + tempest_concurrency: 1 + zuul_copy_output: + '{{ devstack_bases.old }}/ironic-bm-logs': logs + irrelevant-files: + - ^test-requirements.txt$ + - ^.*\.rst$ + - ^api-ref/.*$ + - ^doc/.*$ + - ^ironic_inspector/test/(?!.*tempest).*$ + - ^ironic_inspector/locale/.*$ + - ^releasenotes/.*$ + - ^setup.cfg$ + - ^tools/.*$ + - ^tox.ini$ diff --git a/zuul.d/legacy-ironic-inspector-jobs.yaml b/zuul.d/legacy-ironic-inspector-jobs.yaml deleted file mode 100644 index 3ce67f038..000000000 --- a/zuul.d/legacy-ironic-inspector-jobs.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# DSVM jobs -- job: - name: legacy-ironic-inspector-dsvm-base - parent: legacy-dsvm-base - required-projects: - - openstack/ironic - - openstack/ironic-inspector - - openstack/ironic-tempest-plugin - - openstack/virtualbmc - irrelevant-files: - - ^test-requirements.txt$ - - ^.*\.rst$ - - ^api-ref/.*$ - - ^doc/.*$ - - ^ironic_inspector/test/(?!.*tempest).*$ - - ^ironic_inspector/locale/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tools/.*$ - - ^tox.ini$ - -- job: - name: ironic-inspector-grenade-dsvm - parent: legacy-ironic-inspector-dsvm-base - run: playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml - post-run: playbooks/legacy/ironic-inspector-grenade-dsvm/post.yaml - timeout: 10800 - required-projects: - - openstack/grenade diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index a17326c97..b017d9f73 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -8,7 +8,7 @@ - release-notes-jobs-python3 check: jobs: - - ironic-inspector-grenade-dsvm + - ironic-inspector-grenade - ironic-inspector-tempest - ironic-inspector-tempest-discovery - ironic-inspector-tempest-managed @@ -21,7 +21,7 @@ gate: queue: ironic jobs: - - ironic-inspector-grenade-dsvm + - ironic-inspector-grenade - ironic-inspector-tempest - ironic-inspector-tempest-discovery - ironic-inspector-tempest-managed