diff options
| author | Chris Evich <cevich@redhat.com> | 2019-01-28 15:12:25 -0500 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-01-29 10:38:51 -0500 |
| commit | 88f222b41daa256ebeee961346dbc74b99156189 (patch) | |
| tree | 9efe2ac5d483e6814e9ded62d2a8c7d4bfd5ce43 /contrib/cirrus/setup_environment.sh | |
| parent | ebe929736cdb0925f26b416d56415348f1d16d92 (diff) | |
| download | podman-88f222b41daa256ebeee961346dbc74b99156189.tar.gz podman-88f222b41daa256ebeee961346dbc74b99156189.tar.bz2 podman-88f222b41daa256ebeee961346dbc74b99156189.zip | |
Cirrus: Enable AppArmor build and test
This was specifically disabled early on in transitioning to cirrus due to
an excessive number of test failures and lack of knowledge. This commit
reverses the stance and unifies build and test commands across all
current platforms.
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index bcfe7e396..838f3c3f3 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -57,7 +57,6 @@ then ubuntu-18) # Always install runc on Ubuntu install_runc_from_git - envstr='export BUILDTAGS="seccomp $($GOSRC/hack/btrfs_tag.sh) $($GOSRC/hack/btrfs_installed_tag.sh) $($GOSRC/hack/ostree_tag.sh) varlink exclude_graphdriver_devicemapper"' ;; fedora-29) ;& # Continue to the next item fedora-28) @@ -67,11 +66,9 @@ then ;& # Continue to the next item centos-7) ;& rhel-7) - envstr='unset BUILDTAGS' # Use default from Makefile ;; *) bad_os_id_ver ;; esac - X=$(echo "$envstr" | tee -a "$HOME/$ENVLIB") && eval "$X" && echo "$X" # Do the same for golang env. vars go env | while read envline |