Separate images for unit and integration tests

feast-dev · feast-ci-bot · Apr 9, 2019 · Feb 19, 2019 · Mar 29, 2019 · Mar 29, 2019
commit fe36f6eb27cc36bd0bd92ba25acc508bead94ed9
diff --git a/testing/docker-images/gcloud-argo/Dockerfile b/testing/docker-images/gcloud-argo/Dockerfile
@@ -0,0 +1,15 @@
+FROM debian:stretch
+
+RUN apt-get update && apt-get install -y make curl gnupg wget python
+
+# Install kubectl gcloud and argo
+RUN wget -qO- https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-241.0.0-linux-x86_64.tar.gz | tar xzf - \
+    && /google-cloud-sdk/bin/gcloud -q components install kubectl \
+    && /google-cloud-sdk/install.sh \
+    && ln -s /google-cloud-sdk/bin/gcloud /usr/bin/gcloud
+RUN curl -sSL -o /usr/local/bin/argo https://github.com/argoproj/argo/releases/download/v2.2.1/argo-linux-amd64 \
+    && chmod +x /usr/local/bin/argo
+
+COPY run.sh /usr/local/bin/
+
+ENTRYPOINT ["run.sh"]
diff --git a/testing/docker-images/gcloud-argo/run.sh b/testing/docker-images/gcloud-argo/run.sh
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+set -e
+printenv
+
+if [ $# -eq 0 ]
+then
+    echo ""
+    echo "please specify commands as arguments, for example \"make test\""
+    echo ""
+    exit 1
+fi
+
+echo ""
+echo "cloning Feast repository..."
+echo ""
+
+git clone https://github.com/gojek/feast
+cd feast
+
+if [ -n "${PULL_NUMBER}" ] && [ "$JOB_TYPE" = "presubmit" ] 
+then
+    echo ""
+    echo "fetching PR ${PULL_NUMBER}..."
+    echo ""
+    git fetch origin pull/"${PULL_NUMBER}"/head:pull_"${PULL_NUMBER}"
+
+    echo ""
+    echo "checking out PR ${PULL_NUMBER}..."
+    echo ""
+    git checkout pull_"${PULL_NUMBER}"
+fi
+
+echo "connecting to test cluster..."
+gcloud container clusters get-credentials primary-test-cluster --zone us-central1-a --project kf-feast
+echo "testing connection to argo..."
+argo list
+if [ $? -ne 0 ]
+then
+    echo "failed to connect to argo"
+    echo "exiting"
+    exit 1
+fi
+
+echo "sha:"
+git rev-parse HEAD
+echo ""
+echo "running tests"
+echo ""
+
+$@
diff --git a/testing/docker-images/test-image/Dockerfile b/testing/docker-images/test-image/Dockerfile
@@ -6,16 +6,6 @@ RUN git clone https://github.com/gojek/feast \
     && cd feast && mvn test || true \
     && cd .. && rm -rf feast
 
-RUN apt-get install -y make curl gnupg wget python
-
-# Install kubectl gcloud and argo
-RUN wget -qO- https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-241.0.0-linux-x86_64.tar.gz | tar xzf - \
-    && /google-cloud-sdk/bin/gcloud -q components install kubectl \
-    && /google-cloud-sdk/install.sh \
-    && ln -s /google-cloud-sdk/bin/gcloud /usr/bin/gcloud
-RUN curl -sSL -o /usr/local/bin/argo https://github.com/argoproj/argo/releases/download/v2.2.1/argo-linux-amd64 \
-    && chmod +x /usr/local/bin/argo
-
 COPY run.sh /usr/local/bin/
 
 ENTRYPOINT ["run.sh"]
diff --git a/testing/integration/Makefile b/testing/integration/Makefile
@@ -16,7 +16,7 @@
 
 .PHONY: test-integration it-redis-bq-dataflow
 
-ifeq ($(TYPE), "PR")
+ifeq ($(TYPE), PR)
 test-integration:
 	argo submit --watch tests/redis-bq-dataflow/workflow.yaml -p prId=$(ID)
 else

diff --git a/testing/prow/config.yaml b/testing/prow/config.yaml
@@ -11,7 +11,7 @@ presubmits:
     always_run: false
     spec:
       containers:
-      - image: us.gcr.io/kf-feast/test-image:1.0.0
+      - image: us.gcr.io/kf-feast/gcloud-argo:1.0.0
         args: ["make", "test-integration", "ID=$PULL_NUMBER", "TYPE=PR"]
         imagePullPolicy: Always
     trigger: integration-batch
@@ -28,7 +28,7 @@ postsubmits:
     always_run: true
     spec:
       containers:
-      - image: us.gcr.io/kf-feast/test-image:1.0.0
+      - image: us.gcr.io/kf-feast/gcloud-argo:1.0.0
         args: ["make", "test-integration", "ID=$PULL_BASE_REF", "TYPE=GITREF"]
         imagePullPolicy: Always
     trigger: integration-batch