Merge pull request #1598 from cevich/readd_verify

Lower Cirrus-CI CPU + Re-add verify step

.cirrus.yml

@@ -9,8 +9,8 @@ gcp_credentials: ENCRYPTED[885c6e4297dd8d6f67593c42b810353af0c505a7a670e2c6fd830
 gce_instance:
     image_project: "libpod-218412"
     zone: "us-central1-a"  # Required by Cirrus for the time being
-    cpu: 4
-    memory: "8Gb"
+    cpu: 2
+    memory: "4Gb"
     disk: 40
 
 # Main collection of env. varss to set for all scripts. All others
@@ -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
 

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