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

DO NOT MERGE: Run tests with Zstd compression default #21571

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
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
11 changes: 0 additions & 11 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,6 @@ build_task:
# Not used here, is used in other tasks
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
- env:
DISTRO_NV: ${PRIOR_FEDORA_NAME}
VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
CI_DESIRED_DATABASE: boltdb
CI_DESIRED_STORAGE: vfs
- env:
<<: *stdenvars
DISTRO_NV: ${RAWHIDE_NAME}
Expand Down Expand Up @@ -668,11 +662,6 @@ container_integration_test_task:
DISTRO_NV: ${FEDORA_NAME}
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
- env:
DISTRO_NV: ${PRIOR_FEDORA_NAME}
VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
CI_DESIRED_DATABASE: boltdb
gce_instance: *fastvm
env:
TEST_FLAVOR: int
Expand Down
2 changes: 1 addition & 1 deletion contrib/cirrus/runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ eof
function _run_build() {
# Ensure always start from clean-slate with all vendor modules downloaded
showrun make clean
showrun make vendor
# showrun make vendor
showrun make -j $(nproc) --output-sync=target podman-release # includes podman, podman-remote, and docs

# There's no reason to validate-binaries across multiple linux platforms
Expand Down
6 changes: 1 addition & 5 deletions hack/make-and-check-size
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,7 @@ for bin in bin/*;do
echo "*"
echo "$separator"
else
echo "* Please investigate, and fix if possible."
echo "*"
echo "* A repo admin can override by setting the $OVERRIDE_LABEL label"
echo "$separator"
exit 1
echo "HACK HACK HACK continuing anyway"
fi
fi
else
Expand Down
3 changes: 3 additions & 0 deletions hack/tree_status.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/usr/bin/env bash

exit 0

set -e

SUGGESTION="${SUGGESTION:-run \"make vendor\" and commit all changes.}"
Expand Down
2 changes: 1 addition & 1 deletion test/system/800-config.bats
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ EOF
skip_if_remote "containers.conf does not effect client side of --remote"

CONTAINERS_CONF=/dev/null run_podman push --help
assert "$output" =~ "--compression-format string.*compression format to use \(default \"gzip\"\)" "containers.conf should set default to gzip"
assert "$output" =~ "--compression-format string.*compression format to use \(default \"zstd\"\)"
assert "$output" !~ "compression level to use \(default" "containers.conf should not set default compressionlevel"

conf_tmp="$PODMAN_TMPDIR/containers.conf"
Expand Down
4 changes: 1 addition & 3 deletions vendor/github.com/containers/buildah/.cirrus.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/containers/common/pkg/config/default.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading