From e6b4a657319ee449b83c593f0d9b087fb99d4f46 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Mon, 20 Feb 2023 08:43:41 +0100
Subject: [PATCH 1/2] CI: Configure additional disk when available

It seems that on some nodepool providers (rax for sure),
we get 40G boot disk and 80G additional disk, while
on others we get 80G boot disk only.

Included fix from I06e262cd48d33ccfc0634589c82dcac80dff51af

Change-Id: I179c41032239f5f0ce6055c79295b32c33fe67a5
(cherry picked from commit a0d758019a753596567128a44032165dc8214f05)
---
 tests/playbooks/pre.yml | 70 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/tests/playbooks/pre.yml b/tests/playbooks/pre.yml
index 0fbeec3dfc..c5604c3b67 100644
--- a/tests/playbooks/pre.yml
+++ b/tests/playbooks/pre.yml
@@ -20,6 +20,76 @@
         path: "{{ kolla_build_logs_dir }}"
         state: directory
 
+    # On RAX hosts, we have a small root partition and a large,
+    # unallocated ephemeral device attached at /dev/xvde
+    - name: Set ephemeral device if /dev/xvde exists
+      when: ansible_devices["xvde"] is defined
+      set_fact:
+        ephemeral_device: "/dev/xvde"
+
+    # On other providers, we have a device called "ephemeral0".
+    - name: Set ephemeral device by label
+      when: ephemeral_device is undefined
+      block:
+        - name: Get ephemeral0 device node
+          command: /sbin/blkid -L ephemeral0
+          register: ephemeral0
+          # rc !=0 is expected
+          failed_when: False
+          changed_when: False
+
+        - name: Set ephemeral device if LABEL exists
+          when: "ephemeral0.rc == 0"
+          set_fact:
+            ephemeral_device: "{{ ephemeral0.stdout }}"
+
+    - name: Configure additional disk (if available)
+      become: true
+      when: ephemeral_device is defined
+      block:
+        - name: Ensure ephemeral device is unmounted
+          ansible.posix.mount:
+            name: "{{ ephemeral_device }}"
+            state: "{{ item }}"
+          loop:
+            - unmounted
+            - absent
+
+        - name: Get existing partitions
+          community.general.parted:
+            device: "{{ ephemeral_device }}"
+            unit: MiB
+            state: info
+          register: ephemeral_partitions
+
+        - name: Remove any existing partitions
+          community.general.parted:
+            device: "{{ ephemeral_device }}"
+            number: "{{ item.num }}"
+            state: absent
+          loop: "{{ ephemeral_partitions.partitions }}"
+
+        - name: Create filesystem on additional partition
+          community.general.filesystem:
+            fstype: ext4
+            dev: "{{ ephemeral_device }}"
+            opts: "-L kolla"
+
+        - name: Ensure /var/lib/docker mountpoint is created
+          ansible.builtin.file:
+            path: "/var/lib/docker"
+            owner: root
+            group: root
+            state: directory
+            mode: 0755
+
+        - name: Mount additional filesystem
+          ansible.posix.mount:
+            path: "/var/lib/docker"
+            src: "LABEL=kolla"
+            fstype: ext4
+            state: mounted
+
     - name: Install Python3 setuptools and family
       package:
         name:

From 3a7f1b2fe6b554b005c0b1b9e711a64353e61b85 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Thu, 16 Feb 2023 08:23:27 +0100
Subject: [PATCH 2/2] CI: Retry docker push on publish jobs

We have a high number of POST_FAILURE jobs failing on at least
one container push - let's fix that.

Change-Id: I0015dd4d3ffe5b3e1202ebcfde2b2c72c4655b41
(cherry picked from commit 0887d2e789e8fcd41b49c6346034c4774ea919dd)
---
 tests/playbooks/publish.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/playbooks/publish.yml b/tests/playbooks/publish.yml
index 4e27086f22..8b24856768 100644
--- a/tests/playbooks/publish.yml
+++ b/tests/playbooks/publish.yml
@@ -23,6 +23,9 @@
             push: yes
             source: local
           loop: "{{ docker_host_info.images }}"
+          register: push_status
+          until: push_status.failed is false
+          retries: 5
       when: kolla_registry == 'dockerhub'
 
     - block:
@@ -39,4 +42,7 @@
             repository: "quay.io/{{ item.RepoTags.0 }}"
             source: local
           loop: "{{ docker_host_info.images }}"
+          register: push_status
+          until: push_status.failed is false
+          retries: 5
       when: kolla_registry == 'quay.io'