diff options
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cirrus/logcollector.sh | 33 | ||||
| -rw-r--r-- | contrib/perftest/main.go | 2 | ||||
| -rwxr-xr-x | contrib/upldrel/entrypoint.sh | 10 |
3 files changed, 21 insertions, 24 deletions
diff --git a/contrib/cirrus/logcollector.sh b/contrib/cirrus/logcollector.sh index 3393ac9b5..b0a644f8c 100755 --- a/contrib/cirrus/logcollector.sh +++ b/contrib/cirrus/logcollector.sh @@ -33,40 +33,35 @@ case $1 in ginkgo) showrun cat $CIRRUS_WORKING_DIR/test/e2e/ginkgo-node-*.log ;; journal) showrun journalctl -b ;; packages) - case $OS_RELEASE_ID in - fedora*) - PKG_LST_CMD='rpm -q --qf=%{N}-%{V}-%{R}-%{ARCH}\n' - PKG_NAMES=(\ - container-selinux \ + # These names are common to Fedora and Ubuntu + PKG_NAMES=(\ + conmon \ containernetworking-plugins \ containers-common \ criu \ golang \ podman \ + skopeo \ slirp4netns \ + ) + case $OS_RELEASE_ID in + fedora*) + PKG_LST_CMD='rpm -q --qf=%{N}-%{V}-%{R}-%{ARCH}\n' + PKG_NAMES+=(\ + container-selinux \ + crun \ + runc \ ) - if [[ "$OS_RELEASE_VER" -lt "31" ]]; then - PKG_NAMES+=(runc) - else - PKG_NAMES+=(crun) - fi ;; ubuntu*) PKG_LST_CMD='dpkg-query --show --showformat=${Package}-${Version}-${Architecture}\n' - PKG_NAMES=(\ - containernetworking-plugins \ - containers-common \ + PKG_NAMES+=(\ cri-o-runc \ - criu \ - golang \ - libvarlink \ - podman \ - skopeo \ - slirp4netns \ ) ;; *) bad_os_id_ver ;; esac + # Any not-present packages will be listed as such $PKG_LST_CMD ${PKG_NAMES[@]} | sort -u ;; *) die 1 "Warning, $(basename $0) doesn't know how to handle the parameter '$1'" diff --git a/contrib/perftest/main.go b/contrib/perftest/main.go index 9b928a6b3..463c35ec2 100644 --- a/contrib/perftest/main.go +++ b/contrib/perftest/main.go @@ -9,7 +9,7 @@ import ( "text/tabwriter" "time" - "github.com/containers/image/types" + "github.com/containers/image/v4/types" "github.com/containers/libpod/libpod" image2 "github.com/containers/libpod/libpod/image" cc "github.com/containers/libpod/pkg/spec" diff --git a/contrib/upldrel/entrypoint.sh b/contrib/upldrel/entrypoint.sh index 6af6829c5..b79f1c5bf 100755 --- a/contrib/upldrel/entrypoint.sh +++ b/contrib/upldrel/entrypoint.sh @@ -7,7 +7,7 @@ source /usr/local/bin/lib_entrypoint.sh req_env_var GCPJSON_FILEPATH GCPNAME GCPPROJECT BUCKET FROM_FILEPATH TO_FILENAME ALSO_FILENAME [[ -r "$FROM_FILEPATH" ]] || \ - die 2 ERROR Cannot read release archive file: "$REL_ARC_FILEPATH" + die 2 ERROR Cannot read release archive file: "$FROM_FILEPATH" [[ -r "$GCPJSON_FILEPATH" ]] || \ die 3 ERROR Cannot read GCP credentials file: "$GCPJSON_FILEPATH" @@ -17,9 +17,11 @@ gcloud_init "$GCPJSON_FILEPATH" echo "Uploading archive as $TO_FILENAME" gsutil cp "$FROM_FILEPATH" "gs://$BUCKET/$TO_FILENAME" -gsutil cp "$FROM_FILEPATH" "gs://$BUCKET/$ALSO_FILENAME" +[[ -z "$ALSO_FILENAME" ]] || \ + gsutil cp "$FROM_FILEPATH" "gs://$BUCKET/$ALSO_FILENAME" echo "." echo "Release now available for download at:" -echo " https://storage.cloud.google.com/$BUCKET/$TO_FILENAME" -echo " https://storage.cloud.google.com/$BUCKET/$ALSO_FILENAME" +echo " https://storage.googleapis.com/$BUCKET/$TO_FILENAME" +[[ -z "$ALSO_FILENAME" ]] || \ + echo " https://storage.googleapis.com/$BUCKET/$ALSO_FILENAME" |