summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Pittau <elfosardo@gmail.com>2020-06-29 15:09:52 +0200
committerRiccardo Pittau <elfosardo@gmail.com>2020-07-25 21:46:32 +0200
commit52cc87e788cdf87c205ba7cf6a6ffae5aba51a62 (patch)
tree6920b219ea3b990b2f4e329f983e28e140edeff0
parent9ca640a1c5427708330406f58c6062899bb1ca9d (diff)
downloadironic-python-agent-52cc87e788cdf87c205ba7cf6a6ffae5aba51a62.tar.gz
Revert jobs to dib
We need to be sure that the issue with the EPEL repo is fixed before reverting to dib. Change-Id: Ib0a80a35dcfc9d51009cc1a6816b191c6926cfdb
-rw-r--r--zuul.d/ironic-python-agent-jobs.yaml17
-rw-r--r--zuul.d/project.yaml10
2 files changed, 16 insertions, 11 deletions
diff --git a/zuul.d/ironic-python-agent-jobs.yaml b/zuul.d/ironic-python-agent-jobs.yaml
index 81df5a96..6755320e 100644
--- a/zuul.d/ironic-python-agent-jobs.yaml
+++ b/zuul.d/ironic-python-agent-jobs.yaml
@@ -34,7 +34,7 @@
SWIFT_TEMPURL_KEY: secretkey
- job:
- name: ipa-tempest-partition-bios-ipmi-direct-src
+ name: ipa-tempest-bios-ipmi-direct-src
parent: ironic-ipa-base
vars:
devstack_services:
@@ -49,12 +49,16 @@
SWIFT_TEMPURL_KEY: secretkey
- job:
- name: ipa-tempest-partition-bios-ipmi-iscsi-dib-src
+ name: ipa-tempest-bios-ipmi-iscsi-src
parent: ironic-ipa-base
vars:
devstack_localrc:
IRONIC_DEFAULT_BOOT_OPTION: netboot
+# note(rpittau) alias to not brake other repos (dib and ipa-builder)
+- job:
+ name: ipa-tempest-partition-bios-ipmi-iscsi-dib-src
+ parent: ipa-tempest-bios-ipmi-iscsi-src
- job:
name: ipa-tempest-wholedisk-bios-ipmi-iscsi-src
@@ -178,7 +182,7 @@
- job:
name: ipa-tempest-partition-bios-ipmi-direct-tinyipa-src
- parent: ipa-tempest-partition-bios-ipmi-direct-src
+ parent: ipa-tempest-bios-ipmi-direct-src
vars:
devstack_localrc:
IRONIC_RAMDISK_TYPE: tinyipa
@@ -186,7 +190,7 @@
- job:
name: ipa-tempest-partition-bios-ipmi-iscsi-tinyipa-src
- parent: ipa-tempest-partition-bios-ipmi-iscsi-dib-src
+ parent: ipa-tempest-bios-ipmi-iscsi-src
vars:
devstack_localrc:
IRONIC_RAMDISK_TYPE: tinyipa
@@ -200,11 +204,12 @@
IRONIC_RAMDISK_TYPE: tinyipa
IRONIC_VM_SPECS_RAM: 384
-# Cloning the jobs so we can update ipa-builder and then we can the old jobs.
+# Cloning the jobs so we can update ipa-builder and then we can remove
+# the old jobs.
- job:
name: ipa-tempest-bios-ipmi-direct-tinyipa-src
parent: ipa-tempest-partition-bios-ipmi-direct-tinyipa-src
- job:
name: ipa-tempest-bios-ipmi-iscsi-tinyipa-src
- parent: ipa-tempest-partition-bios-ipmi-iscsi-tinyipa-src
+ parent: ipa-tempest-partition-bios-ipmi-iscsi-tinyipa-src \ No newline at end of file
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 62156e35..076cc3cc 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -10,8 +10,8 @@
jobs:
# NOTE(iurygregory) Only run this two jobs since we are testing
# wholedisk + partition on tempest
- - ipa-tempest-bios-ipmi-direct-tinyipa-src
- - ipa-tempest-bios-ipmi-iscsi-tinyipa-src
+ - ipa-tempest-bios-ipmi-direct-src
+ - ipa-tempest-bios-ipmi-iscsi-src
- ironic-standalone-ipa-src
- metalsmith-integration-ipa-src
# NOTE(dtantsur): non-voting because IPA source code is very unlikely
@@ -30,8 +30,8 @@
gate:
queue: ironic
jobs:
- - ipa-tempest-bios-ipmi-direct-tinyipa-src
- - ipa-tempest-bios-ipmi-iscsi-tinyipa-src
+ - ipa-tempest-bios-ipmi-direct-src
+ - ipa-tempest-bios-ipmi-iscsi-src
- ironic-standalone-ipa-src
- metalsmith-integration-ipa-src
experimental:
@@ -41,4 +41,4 @@
post:
jobs:
- ironic-python-agent-build-image-tinyipa
- - ironic-python-agent-build-image-dib-centos8
+ - ironic-python-agent-build-image-dib-centos8 \ No newline at end of file