diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cirrus/cron-fail_addrs.csv | 2 | ||||
| -rwxr-xr-x | contrib/cirrus/pr-should-include-tests | 3 | ||||
| -rwxr-xr-x | contrib/cirrus/pr-should-include-tests.t | 1 | ||||
| -rwxr-xr-x | contrib/cirrus/runner.sh | 4 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 1 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 23 |
6 files changed, 32 insertions, 2 deletions
diff --git a/contrib/cirrus/cron-fail_addrs.csv b/contrib/cirrus/cron-fail_addrs.csv index c25fc1226..276158163 100644 --- a/contrib/cirrus/cron-fail_addrs.csv +++ b/contrib/cirrus/cron-fail_addrs.csv @@ -1 +1 @@ -rh.container.bot@gmail.com +rh.container.bot@gmail.com,podman-monitor@lists.podman.io diff --git a/contrib/cirrus/pr-should-include-tests b/contrib/cirrus/pr-should-include-tests index a3b4847a7..e3c5d5da1 100755 --- a/contrib/cirrus/pr-should-include-tests +++ b/contrib/cirrus/pr-should-include-tests @@ -22,7 +22,8 @@ base=$(git merge-base ${DEST_BRANCH:-master} $head) # A foo.c # M bar.c # We look for Added or Modified (not Deleted!) files under 'test'. -if git diff --name-status $base $head | egrep -q '^[AM]\s+(test/|.*_test\.go)'; then +# --no-renames ensures that renamed tests (#9420) show up as 'A'dded. +if git diff --name-status --no-renames $base $head | egrep -q '^[AM]\s+(test/|.*_test\.go)'; then exit 0 fi diff --git a/contrib/cirrus/pr-should-include-tests.t b/contrib/cirrus/pr-should-include-tests.t index 4618060a3..965a3b574 100755 --- a/contrib/cirrus/pr-should-include-tests.t +++ b/contrib/cirrus/pr-should-include-tests.t @@ -38,6 +38,7 @@ tests=" 0 c342583da 12f835d12 PR 8523, version.go + podman.spec.in 0 c342583da db1d2ff11 version bump to v2.2.0 0 8f75ed958 7b3ad6d89 PR 8835, only a README.md change +0 b6db60e58 f06dd45e0 PR 9420, a test rename " # The script we're testing diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index ccbdb63b6..fca9aff93 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -70,6 +70,10 @@ function _run_sys() { dotest system } +function _run_upgrade_test() { + bats test/upgrade |& logformatter +} + function _run_bindings() { # shellcheck disable=SC2155 export PATH=$PATH:$GOSRC/hack diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 4c95d0254..64ea3b7b4 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -200,6 +200,7 @@ case "$TEST_FLAVOR" in compose) ;& int) ;& sys) ;& + upgrade_test) ;& bindings) ;& endpoint) # Use existing host bits when testing is to happen inside a container diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index db79ebede..662234f71 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -380,6 +380,29 @@ tar zxf %{SOURCE1} %build mkdir _build pushd _build + +# These flags should work for all rpm distros and arches +export CGO_CFLAGS="-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" + +%if 0%{?fedora} || 0%{?rhel} +# This flag is only present on RH-family distros +export CGO_CFLAGS+=" -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1" +%endif + +%ifnarch %{ix86} +# Build fails on i686 with this flag +export CGO_CFLAGS+=" -D_FILE_OFFSET_BITS=64" +%endif + +%ifarch x86_64 +# Builds only on x86_64 with this flag +export CGO_CFLAGS+=" -m64 -mtune=generic" +%if 0%{?fedora} || 0%{?rhel} >= 8 +# Build fails on rhel7 and non-86_64 with this flag +export CGO_CFLAGS+=" -fcf-protection" +%endif +%endif + mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../../ src/%{import_path} popd |