Merge pull request #103 from cevich/cache_swagger

Install swagger binary for podman CI
containers · Dec 9, 2021 · e752b6d · e752b6d
2 parents d63b522 + 785bca0
commit e752b6d
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -113,7 +113,8 @@ tooling_images_task:
     skip: &ci_docs $CIRRUS_CHANGE_TITLE =~ '.*CI:DOCS.*'
     depends_on:
         - validate
-    timeout_in: 30m
+    # TODO: This should not take this long, but it can :(
+    timeout_in: 40m
     gce_instance: *ibi_vm
     env:
         <<: *image_env

diff --git a/cache_images/podman_tooling.sh b/cache_images/podman_tooling.sh
@@ -19,6 +19,14 @@ bigto $SUDO make install.tools
 # shellcheck disable=SC2154
 if [[ "$OS_RELEASE_ID" == "ubuntu" ]]; then
     lilto $SUDO make install.libseccomp.sudo
+else  # Fedora
+    msg "Installing swagger binary"
+    download_url=$(\
+        curl -s https://api.github.com/repos/go-swagger/go-swagger/releases/latest | \
+        jq -r '.assets[] | select(.name | contains("linux_amd64")) | .browser_download_url')
+    $SUDO curl --fail -s -o /usr/local/bin/swagger -L'#' "$download_url"
+    $SUDO chmod +x /usr/local/bin/swagger
+    /usr/local/bin/swagger version
 fi
 
 # Make pristine for other runtime usage/expectations also save a bit

diff --git a/gcsupld/Containerfile b/gcsupld/Containerfile
@@ -1,7 +1,5 @@
 FROM imgts:latest
 
-RUN yum -y --setopt=keepcache=true update
-
 COPY /gcsupld/entrypoint.sh /usr/local/bin/entrypoint.sh
 RUN chmod 755 /usr/local/bin/entrypoint.sh
 

diff --git a/imgobsolete/Containerfile b/imgobsolete/Containerfile
@@ -1,7 +1,5 @@
 FROM imgts:latest
 
-RUN yum -y --setopt=keepcache=true update
-
 COPY /imgobsolete/entrypoint.sh /usr/local/bin/entrypoint.sh
 RUN chmod 755 /usr/local/bin/entrypoint.sh
 

diff --git a/imgprune/Containerfile b/imgprune/Containerfile
@@ -1,7 +1,5 @@
 FROM imgts:latest
 
-RUN yum -y --setopt=keepcache=true update
-
 COPY /imgprune/entrypoint.sh /usr/local/bin/entrypoint.sh
 RUN chmod 755 /usr/local/bin/entrypoint.sh
 

diff --git a/imgts/Containerfile b/imgts/Containerfile
@@ -2,9 +2,10 @@ FROM quay.io/centos/centos:stream8
 
 # Only needed for installing build-time dependencies
 COPY /imgts/google-cloud-sdk.repo /etc/yum.repos.d/google-cloud-sdk.repo
-RUN yum -y --setopt=keepcache=true update && \
-    yum -y --setopt=keepcache=true install epel-release && \
-    yum -y --setopt=keepcache=true install google-cloud-sdk
+RUN dnf -y --setopt=keepcache=true update && \
+    dnf -y --setopt=keepcache=true install epel-release && \
+    dnf -y --setopt=keepcache=true --exclude=google-cloud-sdk-366.0.0-1 \
+        install google-cloud-sdk
 
 # These all represent required variables which must be set by caller
 ENV GCPJSON="__unknown__" \

diff --git a/orphanvms/Containerfile b/orphanvms/Containerfile
@@ -1,7 +1,5 @@
 FROM imgts:latest
 
-RUN yum -y --setopt=keepcache=true update
-
 COPY /orphanvms/entrypoint.sh /usr/local/bin/entrypoint.sh
 RUN chmod 755 /usr/local/bin/entrypoint.sh