Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install swagger binary for podman CI #103

Merged
merged 3 commits into from
Dec 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions cache_images/podman_tooling.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions gcsupld/Containerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 0 additions & 2 deletions imgobsolete/Containerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 0 additions & 2 deletions imgprune/Containerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
7 changes: 4 additions & 3 deletions imgts/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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__" \
Expand Down
2 changes: 0 additions & 2 deletions orphanvms/Containerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down