diff options
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cirrus/integration_test.sh | 4 | ||||
| -rw-r--r-- | contrib/cirrus/lib.sh | 7 | ||||
| -rwxr-xr-x | contrib/cirrus/logcollector.sh | 44 | ||||
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 1 | ||||
| -rw-r--r-- | contrib/perftest/main.go | 2 | ||||
| -rwxr-xr-x | contrib/upldrel/entrypoint.sh | 10 | ||||
| -rw-r--r-- | contrib/varlink/io.podman.socket | 1 |
7 files changed, 39 insertions, 30 deletions
diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh index 110066ea7..e8f6c50d9 100755 --- a/contrib/cirrus/integration_test.sh +++ b/contrib/cirrus/integration_test.sh @@ -4,7 +4,7 @@ set -e source $(dirname $0)/lib.sh -req_env_var GOSRC SCRIPT_BASE OS_RELEASE_ID OS_RELEASE_VER CONTAINER_RUNTIME +req_env_var GOSRC SCRIPT_BASE OS_RELEASE_ID OS_RELEASE_VER CONTAINER_RUNTIME VARLINK_LOG # Our name must be of the form xxxx_test or xxxx_test.sh, where xxxx is # the test suite to run; currently (2019-05) the only option is 'integration' @@ -59,7 +59,7 @@ case "$SPECIALMODE" in make test-binaries if [[ "$TEST_REMOTE_CLIENT" == "true" ]] then - make remote${TESTSUITE} + make remote${TESTSUITE} VARLINK_LOG=$VARLINK_LOG else make local${TESTSUITE} fi diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index fe4c25e73..8a7d3c1a3 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -35,6 +35,9 @@ PACKER_BASE=${PACKER_BASE:-./contrib/cirrus/packer} SETUP_MARKER_FILEPATH="${SETUP_MARKER_FILEPATH:-/var/tmp/.setup_environment_sh_complete}" AUTHOR_NICKS_FILEPATH="${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/git_authors_to_irc_nicks.csv" +# Log remote-client system test varlink output here +export VARLINK_LOG=/var/tmp/varlink.log + cd $GOSRC if type -P git &> /dev/null && [[ -d "$GOSRC/.git" ]] then @@ -370,8 +373,8 @@ remove_packaged_podman_files() { # yum/dnf/dpkg may list system directories, only remove files $LISTING_CMD | while read fullpath do - # TODO: This can go away when conmon gets it's own package - if [[ -d "$fullpath" ]] || [[ $(basename "$fullpath") == "conmon" ]] ; then continue; fi + # Sub-directories may contain unrelated/valuable stuff + if [[ -d "$fullpath" ]]; then continue; fi ooe.sh sudo rm -vf "$fullpath" done diff --git a/contrib/cirrus/logcollector.sh b/contrib/cirrus/logcollector.sh index 3393ac9b5..17f5eb099 100755 --- a/contrib/cirrus/logcollector.sh +++ b/contrib/cirrus/logcollector.sh @@ -4,7 +4,7 @@ set -e source $(dirname $0)/lib.sh -req_env_var CIRRUS_WORKING_DIR OS_RELEASE_ID +req_env_var CIRRUS_WORKING_DIR OS_RELEASE_ID TEST_REMOTE_CLIENT # Assume there are other log collection commands to follow - Don't # let one break another that may be useful, but also keep any @@ -32,41 +32,45 @@ case $1 in df) showrun df -lhTx tmpfs ;; ginkgo) showrun cat $CIRRUS_WORKING_DIR/test/e2e/ginkgo-node-*.log ;; journal) showrun journalctl -b ;; + varlink) + if [[ "$TEST_REMOTE_CLIENT" == "true" ]] + then + echo "(Trailing 100 lines of $VARLINK_LOG)" + showrun tail -100 $VARLINK_LOG + else + die 0 "\$TEST_REMOTE_CLIENT is not 'true': $TEST_REMOTE_CLIENT" + fi + ;; 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/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index 679ad3b8d..38b9e6860 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -31,6 +31,7 @@ ooe.sh sudo dnf install -y \ bridge-utils \ btrfs-progs-devel \ bzip2 \ + conmon \ container-selinux \ containernetworking-plugins \ containers-common \ 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" diff --git a/contrib/varlink/io.podman.socket b/contrib/varlink/io.podman.socket index 629a5dd20..f6a3ddc49 100644 --- a/contrib/varlink/io.podman.socket +++ b/contrib/varlink/io.podman.socket @@ -8,4 +8,3 @@ SocketMode=0600 [Install] WantedBy=sockets.target -Also=multi-user.target |