diff options
Diffstat (limited to 'contrib/cirrus')
| -rw-r--r-- | contrib/cirrus/container_test.sh | 1 | ||||
| -rwxr-xr-x | contrib/cirrus/integration_test.sh | 2 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/contrib/cirrus/container_test.sh b/contrib/cirrus/container_test.sh index 27baf0ad7..9d3f09f60 100644 --- a/contrib/cirrus/container_test.sh +++ b/contrib/cirrus/container_test.sh @@ -126,6 +126,7 @@ if [ $install -eq 1 ]; then make TAGS="${TAGS}" install.bin PREFIX=/usr ETCDIR=/etc make TAGS="${TAGS}" install.man PREFIX=/usr ETCDIR=/etc make TAGS="${TAGS}" install.cni PREFIX=/usr ETCDIR=/etc + make TAGS="${TAGS}" install.config PREFIX=/usr ETCDIR=/etc make TAGS="${TAGS}" install.systemd PREFIX=/usr ETCDIR=/etc fi diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh index 552f2ba73..00c3b0ec3 100755 --- a/contrib/cirrus/integration_test.sh +++ b/contrib/cirrus/integration_test.sh @@ -45,6 +45,7 @@ case "$SPECIALMODE" in export OCI_RUNTIME=/usr/bin/crun make make install PREFIX=/usr ETCDIR=/etc + make install.config PREFIX=/usr make test-binaries make local${TESTSUITE} ;; @@ -57,6 +58,7 @@ case "$SPECIALMODE" in none) make make install PREFIX=/usr ETCDIR=/etc + make install.config PREFIX=/usr make test-binaries if [[ "$TEST_REMOTE_CLIENT" == "true" ]] then diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 7c7659169..c1a01d6ab 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -50,9 +50,7 @@ case "${OS_REL_VER}" in bash "$SCRIPT_BASE/add_second_partition.sh"; fi ;; centos-7) # Current VM is an image-builder-image no local podman/testing - echo "No further setup required for VM image building" - # All SELinux distros need this for systemd-in-a-container - setsebool container_manage_cgroup true + echo "No further setup required for VM image building" exit 0 ;; *) bad_os_id_ver ;; |