diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-30 11:23:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 11:23:05 +0100 |
| commit | b01ec95bda1f0398e62be85aeade70f2e6a1ca8d (patch) | |
| tree | c768302438a4dd019bab007c51c3698affb56be7 /contrib/cirrus/setup_environment.sh | |
| parent | 76019c31f535c6473e5f7d645cf42ca4477e2c33 (diff) | |
| parent | 18b7009754df560d6debcba6123888af62b6e3e0 (diff) | |
| download | podman-b01ec95bda1f0398e62be85aeade70f2e6a1ca8d.tar.gz podman-b01ec95bda1f0398e62be85aeade70f2e6a1ca8d.tar.bz2 podman-b01ec95bda1f0398e62be85aeade70f2e6a1ca8d.zip | |
Merge pull request #2225 from cevich/enable_apparmor
Cirrus: Enable AppArmor build and test
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 |