Merge pull request #2435 from cevich/add_bats

Cirrus: Add BATS package for all platforms

7 files changed, 12 insertions, 27 deletions

diff --git a/.cirrus.yml b/.cirrus.yml
index 4521866d1..b473980ea 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -27,11 +27,11 @@ env:
     ####
     #### Cache-image names to test with
     ###
-    FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-7f4cd1f7"
-    PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-7f4cd1f7"
-    UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-84514d8b"
+    FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-d6d53e40"
+    PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-d6d53e40"
+    UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-d6d53e40"
     # RHEL_CACHE_IMAGE_NAME: "rhel-8-notready"
-    PRIOR_RHEL_CACHE_IMAGE_NAME: "rhel-7-libpod-7f4cd1f7"
+    PRIOR_RHEL_CACHE_IMAGE_NAME: "rhel-7-libpod-d6d53e40"
     # CENTOS_CACHE_IMAGE_NAME: "centos-7-notready"
 
     ####
@@ -169,9 +169,9 @@ testing_task:
             image_name: "${FEDORA_CACHE_IMAGE_NAME}"
             image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
             image_name: "${UBUNTU_CACHE_IMAGE_NAME}"
-            image_name: "${PRIOR_RHEL_CACHE_IMAGE_NAME}"
 
-            # TODO: tests fail
+            # TODO: Make these work (also optional_testing_task below)
+            # image_name: "${PRIOR_RHEL_CACHE_IMAGE_NAME}"
             # image_name: "${RHEL_CACHE_IMAGE_NAME}"
             # image_name: "${CENTOS_CACHE_IMAGE_NAME}"
 
@@ -206,9 +206,9 @@ optional_testing_task:
             image_name: "${FEDORA_CACHE_IMAGE_NAME}"
             image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
             image_name: "${UBUNTU_CACHE_IMAGE_NAME}"
-            image_name: "${PRIOR_RHEL_CACHE_IMAGE_NAME}"
-            # TODO: Make these work (also build_images_task below)
+            # TODO: Make these work (also testing_task above)
             # image_name: "${RHEL_CACHE_IMAGE_NAME}"
+            # image_name: "${PRIOR_RHEL_CACHE_IMAGE_NAME}"
             # image_name: "${CENTOS_CACHE_IMAGE_NAME}"
 
     timeout_in: 60m
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 8be696933..acd2447c0 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -300,21 +300,6 @@ EOF
     fi
 }
 
-# Runs in testing VM, not image building
-install_testing_dependencies() {
-    echo "Installing ginkgo, gomega, and easyjson into \$GOPATH=$GOPATH"
-    req_env_var "
-        GOPATH $GOPATH
-        GOSRC $GOSRC
-    "
-    cd "$GOSRC"
-    ooe.sh go get -u github.com/onsi/ginkgo/ginkgo
-    ooe.sh install -D -m 755 "$GOPATH"/bin/ginkgo /usr/bin/
-    ooe.sh go get github.com/onsi/gomega/...
-    ooe.sh go get -u github.com/mailru/easyjson/...
-    sudo install -D -m 755 "$GOPATH"/bin/easyjson /usr/bin/
-}
-
 install_packer_copied_files(){
     # Install cni config, policy and registry config
     sudo install -D -m 755 /tmp/libpod/cni/87-podman-bridge.conflist \
diff --git a/contrib/cirrus/packer/centos_setup.sh b/contrib/cirrus/packer/centos_setup.sh
index 923f2563b..d947a1d7f 100644
--- a/contrib/cirrus/packer/centos_setup.sh
+++ b/contrib/cirrus/packer/centos_setup.sh
@@ -27,6 +27,7 @@ ooe.sh sudo yum -y install centos-release-scl epel-release
 ooe.sh sudo yum -y install \
     PyYAML \
     atomic-registries \
+    bats \
     btrfs-progs-devel \
     bzip2 \
     device-mapper-devel \
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh
index de7ad4506..84aee7667 100644
--- a/contrib/cirrus/packer/fedora_setup.sh
+++ b/contrib/cirrus/packer/fedora_setup.sh
@@ -26,6 +26,7 @@ ooe.sh sudo dnf update -y
 
 ooe.sh sudo dnf install -y \
     atomic-registries \
+    bats \
     btrfs-progs-devel \
     bzip2 \
     device-mapper-devel \
diff --git a/contrib/cirrus/packer/rhel_setup.sh b/contrib/cirrus/packer/rhel_setup.sh
index ac6866a57..20be97f9b 100644
--- a/contrib/cirrus/packer/rhel_setup.sh
+++ b/contrib/cirrus/packer/rhel_setup.sh
@@ -33,6 +33,7 @@ ooe.sh sudo yum -y update
 ooe.sh sudo yum -y install \
     PyYAML \
     atomic-registries \
+    bats \
     btrfs-progs-devel \
     bzip2 \
     device-mapper-devel \
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index 5b7e1d714..24f1cce21 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -38,6 +38,7 @@ ooe.sh sudo -E apt-get -qq install \
     apparmor \
     autoconf \
     automake \
+    bats \
     bison \
     btrfs-tools \
     build-essential \
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 77c20d9bd..c3276bb6f 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -78,10 +78,6 @@ then
 
     cd "${GOSRC}/"
     source "$SCRIPT_BASE/lib.sh"
-
-    # Only testing-VMs need deps installed, not image-builder VM
-    echo "$CIRRUS_TASK_NAME" | grep -q 'image' || \
-       install_testing_dependencies  # must exist in $GOPATH
 fi
 
 record_timestamp "env. setup end"