From 50683c9d9a78adc9378e7746915f435e59e6e970 Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Fri, 7 Feb 2020 02:02:18 +0000
Subject: [PATCH] playbooks: Reduce flakiness due to network errors when
 pulling images

This change adds a pre-run task to pull the fedora-toolbox images from
the registry to reduce the number of false positives caused by
'podman pull' failing to download them during the actual test.

Each section needs a separate playbook because they use different
versions of Fedora, and hence different default images.

https://github.com/containers/toolbox/pull/375
---
 playbooks/fedora-30/pre-common.yaml         | 13 +++++++++++++
 playbooks/fedora-30/setup-rpm-env.yaml      |  2 ++
 playbooks/fedora-31/pre-common.yaml         | 13 +++++++++++++
 playbooks/fedora-31/setup-rpm-env.yaml      |  2 ++
 playbooks/fedora-rawhide/pre-common.yaml    | 13 +++++++++++++
 playbooks/fedora-rawhide/setup-rpm-env.yaml |  2 ++
 6 files changed, 45 insertions(+)
 create mode 100644 playbooks/fedora-30/pre-common.yaml
 create mode 100644 playbooks/fedora-31/pre-common.yaml
 create mode 100644 playbooks/fedora-rawhide/pre-common.yaml

diff --git a/playbooks/fedora-30/pre-common.yaml b/playbooks/fedora-30/pre-common.yaml
new file mode 100644
index 000000000..784c10a70
--- /dev/null
+++ b/playbooks/fedora-30/pre-common.yaml
@@ -0,0 +1,13 @@
+- name: Pull registry.fedoraproject.org/f30/fedora-toolbox:30
+  command: podman pull registry.fedoraproject.org/f30/fedora-toolbox:30
+  register: _podman
+  until: _podman.rc == 0
+  retries: 5
+  delay: 10
+
+- name: Pull registry.fedoraproject.org/f29/fedora-toolbox:29
+  command: podman pull registry.fedoraproject.org/f29/fedora-toolbox:29
+  register: _podman
+  until: _podman.rc == 0
+  retries: 5
+  delay: 10
diff --git a/playbooks/fedora-30/setup-rpm-env.yaml b/playbooks/fedora-30/setup-rpm-env.yaml
index a54a102b2..ccb9ccd1e 100644
--- a/playbooks/fedora-30/setup-rpm-env.yaml
+++ b/playbooks/fedora-30/setup-rpm-env.yaml
@@ -20,3 +20,5 @@
 
     - name: Check versions of crucial packages
       command: rpm -q podman runc conmon fuse-overlayfs flatpak-session-helper
+
+    - include_tasks: ./pre-common.yaml
diff --git a/playbooks/fedora-31/pre-common.yaml b/playbooks/fedora-31/pre-common.yaml
new file mode 100644
index 000000000..0f43e0a09
--- /dev/null
+++ b/playbooks/fedora-31/pre-common.yaml
@@ -0,0 +1,13 @@
+- name: Pull registry.fedoraproject.org/f31/fedora-toolbox:31
+  command: podman pull registry.fedoraproject.org/f31/fedora-toolbox:31
+  register: _podman
+  until: _podman.rc == 0
+  retries: 5
+  delay: 10
+
+- name: Pull registry.fedoraproject.org/f29/fedora-toolbox:29
+  command: podman pull registry.fedoraproject.org/f29/fedora-toolbox:29
+  register: _podman
+  until: _podman.rc == 0
+  retries: 5
+  delay: 10
diff --git a/playbooks/fedora-31/setup-rpm-env.yaml b/playbooks/fedora-31/setup-rpm-env.yaml
index 8c85fbc1e..3f70c581d 100644
--- a/playbooks/fedora-31/setup-rpm-env.yaml
+++ b/playbooks/fedora-31/setup-rpm-env.yaml
@@ -20,3 +20,5 @@
 
     - name: Check versions of crucial packages
       command: rpm -q podman crun conmon fuse-overlayfs flatpak-session-helper
+
+    - include_tasks: ./pre-common.yaml
diff --git a/playbooks/fedora-rawhide/pre-common.yaml b/playbooks/fedora-rawhide/pre-common.yaml
new file mode 100644
index 000000000..014928eca
--- /dev/null
+++ b/playbooks/fedora-rawhide/pre-common.yaml
@@ -0,0 +1,13 @@
+- name: Pull registry.fedoraproject.org/f32/fedora-toolbox:32
+  command: podman pull registry.fedoraproject.org/f32/fedora-toolbox:32
+  register: _podman
+  until: _podman.rc == 0
+  retries: 5
+  delay: 10
+
+- name: Pull registry.fedoraproject.org/f29/fedora-toolbox:29
+  command: podman pull registry.fedoraproject.org/f29/fedora-toolbox:29
+  register: _podman
+  until: _podman.rc == 0
+  retries: 5
+  delay: 10
diff --git a/playbooks/fedora-rawhide/setup-rpm-env.yaml b/playbooks/fedora-rawhide/setup-rpm-env.yaml
index 9a9c3799c..4b7f8cf0f 100644
--- a/playbooks/fedora-rawhide/setup-rpm-env.yaml
+++ b/playbooks/fedora-rawhide/setup-rpm-env.yaml
@@ -21,3 +21,5 @@
 
     - name: Check versions of crucial packages
       command: rpm -q podman crun conmon fuse-overlayfs flatpak-session-helper
+
+    - include_tasks: ./pre-common.yaml