From d77a30db36c7bc936e80f87a1b366431f42116a1 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 15 Mar 2022 10:12:22 +0000
Subject: [PATCH] CI: Don't download Cirros or IPA in seed jobs
We build IPA images and a deployment image in the seed jobs, so we don't
need to download Cirros or IPA images. Also, these downloads depend on
external resources which may make jobs less reliable.
For seed upgrade jobs, disable IPA and deployment image downloads.
Change-Id: Ib59c8bc2d8938eca18c943bb2e66ed185152a739
---
playbooks/kayobe-seed-base/bifrost-overrides.yml.j2 | 7 -------
playbooks/kayobe-seed-base/pre.yml | 5 -----
.../kayobe-seed-upgrade-base/bifrost-overrides.yml.j2 | 6 +++---
3 files changed, 3 insertions(+), 15 deletions(-)
delete mode 100644 playbooks/kayobe-seed-base/bifrost-overrides.yml.j2
diff --git a/playbooks/kayobe-seed-base/bifrost-overrides.yml.j2 b/playbooks/kayobe-seed-base/bifrost-overrides.yml.j2
deleted file mode 100644
index 0ada56a2..00000000
--- a/playbooks/kayobe-seed-base/bifrost-overrides.yml.j2
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# Don't build an IPA deployment image, instead download upstream images.
-create_ipa_image: false
-download_ipa: true
-
-# Don't build a disk image. It takes time and can be unreliable.
-use_cirros: true
diff --git a/playbooks/kayobe-seed-base/pre.yml b/playbooks/kayobe-seed-base/pre.yml
index 8062ff5a..1d4bc5e9 100644
--- a/playbooks/kayobe-seed-base/pre.yml
+++ b/playbooks/kayobe-seed-base/pre.yml
@@ -30,11 +30,6 @@
path: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/config/bifrost"
state: "directory"
- - name: Ensure bifrost overrides file exists
- template:
- src: bifrost-overrides.yml.j2
- dest: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/config/bifrost/bifrost.yml"
-
- name: Ensure kayobe is installed
shell:
cmd: dev/install.sh &> {{ logs_dir }}/ansible/install
diff --git a/playbooks/kayobe-seed-upgrade-base/bifrost-overrides.yml.j2 b/playbooks/kayobe-seed-upgrade-base/bifrost-overrides.yml.j2
index 0ada56a2..b429c01c 100644
--- a/playbooks/kayobe-seed-upgrade-base/bifrost-overrides.yml.j2
+++ b/playbooks/kayobe-seed-upgrade-base/bifrost-overrides.yml.j2
@@ -1,7 +1,7 @@
---
-# Don't build an IPA deployment image, instead download upstream images.
+# Don't build an IPA deployment image.
create_ipa_image: false
-download_ipa: true
+download_ipa: false
# Don't build a disk image. It takes time and can be unreliable.
-use_cirros: true
+create_image_via_dib: false
--
GitLab