Merge pull request #170 from stackhpc/upstream/xena-2022-10-03

markgoddard · web-flow · commit 3b64678658c1 · 2022-10-03T15:15:03.000+01:00
Synchronise xena with upstream
diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
@@ -1,4 +1,7 @@
 ---
+- project:
+    queue: kolla
+
 - secret:
     name: kolla_dockerhub_creds
     data:
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml
@@ -6,16 +6,15 @@
         - kolla-build-centos8s-source
         - kolla-ansible-centos8s-source
         - kolla-ansible-centos8s-binary
-        - kolla-ansible-centos8s-source-upgrade
+        # - kolla-ansible-centos8s-source-upgrade
     check-arm64:
       jobs:
         - kolla-build-centos8s-source-aarch64
     gate:
-      queue: kolla
       jobs:
         - kolla-build-centos8s-source
         - kolla-ansible-centos8s-source
-        - kolla-ansible-centos8s-source-upgrade
+        # - kolla-ansible-centos8s-source-upgrade
     periodic:
       jobs:
         - kolla-publish-centos8s-source-quay
diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml
@@ -11,7 +11,6 @@
       jobs:
         - kolla-build-ubuntu-source-aarch64
     gate:
-      queue: kolla
       jobs:
         - kolla-build-ubuntu-source
         - kolla-ansible-ubuntu-source
diff --git a/docker/base/curlrc b/docker/base/curlrc
@@ -1,6 +1,7 @@
 # curl default options
 --fail
 --location
+--retry 5
 --silent
 --show-error
 --write-out "curl (%{url_effective}): response: %{http_code}, time: %{time_total}, size: %{size_download}\n"
diff --git a/releasenotes/notes/curl-retries-e1c5d6b5b25d7380.yaml b/releasenotes/notes/curl-retries-e1c5d6b5b25d7380.yaml
@@ -0,0 +1,4 @@
+---
+other:
+  - |
+    Added '--retry 5' to curlrc to improve curl downloads during image builds.

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +---
 +other:
 +  - |
 +    Added '--retry 5' to curlrc to improve curl downloads during image builds.