bots: Adjust for Fedora Atomic now being version 28

The download path changed, there is no CloudImages/ subdir any more. The qcow images moved to AtomicHost/ instead. Closes cockpit-project#9090
martinpitt · May 2, 2018 · ef9ff58 · ef9ff58
1 parent 85bb3e0
commit ef9ff58
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/bots/image-prepare b/bots/image-prepare
@@ -199,11 +199,11 @@ def only_install(image, build_results, skips, args, address):
 
 # The Atomic variants can't build their own packages, so we build in
 # their non-Atomic siblings.  For example, fedora-atomic is built
-# in fedora-27
+# in fedora-28
 def get_build_image(image):
     (test_os, unused) = os.path.splitext(os.path.basename(image))
     if test_os == "fedora-atomic":
-        image = "fedora-27"
+        image = "fedora-28"
     elif test_os == "rhel-atomic":
         image = "rhel-7"
     elif test_os == "continuous-atomic":

diff --git a/bots/image-refresh b/bots/image-refresh
@@ -42,10 +42,10 @@ TRIGGERS = {
     ],
     "fedora-27": [
         "verify/fedora-27",
-        "verify/fedora-atomic",
     ],
     "fedora-28": [
         "verify/fedora-28",
+        "verify/fedora-atomic",
     ],
     "fedora-atomic": [
         "verify/fedora-atomic"

diff --git a/bots/images/scripts/fedora-atomic.bootstrap b/bots/images/scripts/fedora-atomic.bootstrap
@@ -8,6 +8,6 @@ url="https://download.fedoraproject.org/pub/alt/atomic/stable/"
 BASE=$(dirname $0)
 
 # The Fedora URLs have the version twice in the name. for example:
-# https://dl.fedoraproject.org/pub/alt/atomic/stable/Fedora-Atomic-25-20160921.0/CloudImages/x86_64/images/Fedora-Cloud-Base-25-20160921.0.x86_64.qcow2
+# https://dl.fedoraproject.org/pub/alt/atomic/stable/Fedora-Atomic-28-20180425.0/AtomicHost/x86_64/images/Fedora-AtomicHost-28-20180425.0.x86_64.qcow2
 $BASE/atomic.bootstrap "$1" "$url" \
-    "Fedora-Atomic-[-0-9\.]+" "CloudImages" "x86_64" "images" "Fedora-Atomic-[-0-9\.]+.x86_64.qcow2"
+    "Fedora-Atomic-[-0-9\.]+" "AtomicHost" "x86_64" "images" "Fedora-AtomicHost-[-0-9\.]+.x86_64.qcow2"
diff --git a/test/verify/check-docker-storage b/test/verify/check-docker-storage
@@ -42,11 +42,11 @@ def can_manage(machine):
 
 # The Atomic variants can't build their own packages, so we build in
 # their non-Atomic siblings.  For example, fedora-atomic is built
-# in fedora-26
+# in fedora-28
 def get_build_image(test_os):
     build_os = test_os
     if test_os == "fedora-atomic":
-        build_os = "fedora-27"
+        build_os = "fedora-28"
     elif test_os == "rhel-atomic":
         build_os = "rhel-7"
     elif test_os == "continuous-atomic":