Merge pull request #418 from cncf/feature/#398_test_binary_in_empty_folder

test binary in empty folder

Author: wvwatson

.travis.yml

@@ -7,7 +7,6 @@ jobs:
   include:
     - stage: K8s
       before_script:
-        - |
         # Download and install go
         - wget https://dl.google.com/go/go1.13.linux-amd64.tar.gz
         - tar -xvf go1.13.linux-amd64.tar.gz

src/tasks/utils/utils.cr

@@ -12,6 +12,7 @@ require "../constants.cr"
 # TODO Move constants out
 # TODO put these functions into a module
 
+# TODO: error with proper exit_code when any of these don't exist and ask user to run setup command
 CNF_DIR = "cnfs"
 CONFIG_FILE = "cnf-conformance.yml"
 TOOLS_DIR = "tools"

tools/curl_install_tester_docker_setup/Dockerfile

@@ -1,10 +1,10 @@
-FROM ubuntu
+FROM ubuntu as base
 
-ARG VERSION=v3.2.4
-ARG FILENAME=helm-${VERSION}-linux-amd64.tar.gz
+ARG HELM_VERSION=v3.2.4
+ARG FILENAME=helm-${HELM_VERSION}-linux-amd64.tar.gz
 ARG KUBECTL=v1.18.4
 
-RUN apt update && apt install -y wget curl 
+RUN apt update && apt install -y wget curl git
 
 RUN curl -L https://get.helm.sh/${FILENAME} | tar zxv -C /tmp
 RUN mv /tmp/linux-amd64/helm /usr/local/bin/
@@ -14,4 +14,11 @@ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$KUBECTL/
 RUN mv ./kubectl /usr/local/bin/kubectl
 RUN chmod +x /usr/local/bin/kubectl
 
-WORKDIR /cnf-conformance
+WORKDIR /test_workspace
+
+from base as ci_test
+# add binary AND ONLY the binary in this container so we can fail if binary is broken without the rest of the source
+COPY cnf-conformance .
+RUN ./cnf-conformance setup verbose
+RUN wget https://raw.githubusercontent.com/cncf/cnf-conformance/master/example-cnfs/coredns/cnf-conformance.yml
+RUN ./cnf-conformance ip_addresses cnf-config=./cnf-conformance.yml verbose

tools/curl_install_tester_docker_setup/README.md

@@ -13,9 +13,9 @@ Curl install tester is a docker setup designed to
 # in the curl_install_tester_docker_setup folder
 # because the dockerfile is there
 
-docker build -t curl_install_tester_docker_setup .
+docker build -t curl_install_tester_docker_setup --target base .
 
-docker run --rm -it curl_install_tester_docker_setup
+docker run --rm -it curl_install_tester_docker_setup 
 
 source <(curl https://raw.githubusercontent.com/cncf/cnf-conformance/master/curl_install.sh)