diff options
author | Chris Evich <cevich@redhat.com> | 2018-10-05 10:38:01 -0400 |
---|---|---|
committer | Chris Evich <cevich@redhat.com> | 2018-10-05 11:23:21 -0400 |
commit | 52f0547f6422211a7ceab43c9da45bc228a71d2b (patch) | |
tree | 813b50ca127258ed73868090e5bdc611d1d6463f | |
parent | eef2cb01cae26ba4c59ea6d438502d8b8de11bad (diff) | |
download | podman-52f0547f6422211a7ceab43c9da45bc228a71d2b.tar.gz podman-52f0547f6422211a7ceab43c9da45bc228a71d2b.tar.bz2 podman-52f0547f6422211a7ceab43c9da45bc228a71d2b.zip |
Re-add source-verify in cirrus-ci
Don't waste GCE VM resources for 30-min of testing,
when verify would fail after 3-minutes. This is
the simpelest mechanism to save cloud CPU-time
while GCE is under trial-status (can not set quotas).
Signed-off-by: Chris Evich <cevich@redhat.com>
-rw-r--r-- | .cirrus.yml | 6 | ||||
-rwxr-xr-x | contrib/cirrus/verify_source.sh | 30 |
2 files changed, 34 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 04ccdefbd..bc471cb84 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -52,9 +52,11 @@ full_vm_testing_task: setup_environment_script: $SCRIPT_BASE/setup_environment.sh # ...or lists of strings - unit_test_script: + verify_source_script: - whoami # root! - - $SCRIPT_BASE/unit_test.sh + - $SCRIPT_BASE/verify_source.sh + + unit_test_script: $SCRIPT_BASE/unit_test.sh integration_test_script: $SCRIPT_BASE/integration_test.sh diff --git a/contrib/cirrus/verify_source.sh b/contrib/cirrus/verify_source.sh new file mode 100755 index 000000000..860bafc00 --- /dev/null +++ b/contrib/cirrus/verify_source.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +set -e +source $(dirname $0)/lib.sh + +req_env_var " +OS_RELEASE_ID $OS_RELEASE_ID +OS_RELEASE_VER $OS_RELEASE_VER +" + +show_env_vars + +set -x +cd "$GOSRC" + +case "${OS_RELEASE_ID}-${OS_RELEASE_VER}" in + ubuntu-18) + make install.tools "BUILDTAGS=$BUILDTAGS" + make validate "BUILDTAGS=$BUILDTAGS" + # make lint "BUILDTAGS=$BUILDTAGS" + ;; + fedora-28) ;& + centos-7) ;& + rhel-7) + make install.tools + make validate + # make lint + ;; + *) bad_os_id_ver ;; +esac |