From 56d0e704c039d5ca4ee155e9b7909746d90b597a Mon Sep 17 00:00:00 2001 From: Jiri Kortus Date: Fri, 25 Jan 2019 17:53:50 +0100 Subject: [PATCH] Make sure compose build tests run with SELinux in enforcing mode Related: rhbz#1654795 --- tests/cli/test_build_and_deploy_aws.sh | 1 + tests/cli/test_build_and_deploy_azure.sh | 1 + tests/cli/test_build_and_deploy_openstack.sh | 2 ++ tests/cli/test_build_and_deploy_vmware.sh | 1 + tests/cli/test_compose_ext4-filesystem.sh | 1 + tests/cli/test_compose_partitioned-disk.sh | 1 + 6 files changed, 7 insertions(+) diff --git a/tests/cli/test_build_and_deploy_aws.sh b/tests/cli/test_build_and_deploy_aws.sh index e9642865..7a8ce7bf 100755 --- a/tests/cli/test_build_and_deploy_aws.sh +++ b/tests/cli/test_build_and_deploy_aws.sh @@ -72,6 +72,7 @@ __EOF__ rlPhaseEnd rlPhaseStartTest "compose start" + rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing" UUID=`$CLI compose start example-http-server ami` rlAssertEquals "exit code should be zero" $? 0 diff --git a/tests/cli/test_build_and_deploy_azure.sh b/tests/cli/test_build_and_deploy_azure.sh index 21846ddc..79069fff 100755 --- a/tests/cli/test_build_and_deploy_azure.sh +++ b/tests/cli/test_build_and_deploy_azure.sh @@ -57,6 +57,7 @@ rlJournalStart rlPhaseEnd rlPhaseStartTest "compose start" + rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing" UUID=`$CLI compose start example-http-server vhd` rlAssertEquals "exit code should be zero" $? 0 diff --git a/tests/cli/test_build_and_deploy_openstack.sh b/tests/cli/test_build_and_deploy_openstack.sh index 5a22d59a..cc39d24e 100755 --- a/tests/cli/test_build_and_deploy_openstack.sh +++ b/tests/cli/test_build_and_deploy_openstack.sh @@ -45,6 +45,8 @@ rlJournalStart rlPhaseEnd rlPhaseStartTest "compose start" + rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing" + # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1639326 cat > $TMP_DIR/http-with-rng.toml << __EOF__ name = "http-with-rng" diff --git a/tests/cli/test_build_and_deploy_vmware.sh b/tests/cli/test_build_and_deploy_vmware.sh index 89f21548..7414cc2b 100755 --- a/tests/cli/test_build_and_deploy_vmware.sh +++ b/tests/cli/test_build_and_deploy_vmware.sh @@ -65,6 +65,7 @@ rlJournalStart rlPhaseEnd rlPhaseStartTest "compose start" + rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing" SSH_KEY_DIR=`mktemp -d /tmp/composer-ssh-keys.XXXXXX` rlRun -t -c "ssh-keygen -t rsa -N '' -f $SSH_KEY_DIR/id_rsa" PUB_KEY=`cat $SSH_KEY_DIR/id_rsa.pub` diff --git a/tests/cli/test_compose_ext4-filesystem.sh b/tests/cli/test_compose_ext4-filesystem.sh index 6e17b1d7..d7d62e14 100755 --- a/tests/cli/test_compose_ext4-filesystem.sh +++ b/tests/cli/test_compose_ext4-filesystem.sh @@ -16,6 +16,7 @@ CLI="./src/bin/composer-cli" rlJournalStart rlPhaseStartTest "compose start" + rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing" UUID=`$CLI compose start example-http-server ext4-filesystem` rlAssertEquals "exit code should be zero" $? 0 diff --git a/tests/cli/test_compose_partitioned-disk.sh b/tests/cli/test_compose_partitioned-disk.sh index 7f6544ec..78f52423 100755 --- a/tests/cli/test_compose_partitioned-disk.sh +++ b/tests/cli/test_compose_partitioned-disk.sh @@ -16,6 +16,7 @@ CLI="./src/bin/composer-cli" rlJournalStart rlPhaseStartTest "compose start" + rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing" UUID=`$CLI compose start example-http-server partitioned-disk` rlAssertEquals "exit code should be zero" $? 0