New cluster setup.

.gitlab-ci.yml

@@ -1,8 +1,5 @@
 variables:
   DOCKER_REPOSITORY: "mozmeao/snippets"
-  DOCKER_IMAGE_TAG: "${DOCKER_REPOSITORY}:${CI_COMMIT_SHORT_SHA}"
-  # Cannot use $DOCKER_IMAGE_TAG because it contains other variables itself.
-  DOCKER_RUN_CMD: "docker run --env-file .docker-env ${DOCKER_REPOSITORY}:${CI_COMMIT_SHORT_SHA}"
 
 stages:
   - build
@@ -70,21 +67,14 @@ run-unit-tests-redirector:
   script:
     - bin/update-config.sh
 
-dev:
-  extends: .deploy
-  only:
-    - master
-  variables:
-    NAMESPACE: snippets-dev
-    CLUSTERS: oregon-a
-
 stage:
   extends: .deploy
   only:
     - stage
   variables:
     NAMESPACE: snippets-stage
     CLUSTERS: oregon-a
+    DOCKER_IMAGE_TAG: "${DOCKER_REPOSITORY}:${CI_COMMIT_SHORT_SHA}"
 
 admin:
   extends: .deploy
@@ -93,11 +83,13 @@ admin:
   variables:
     NAMESPACE: snippets-admin
     CLUSTERS: oregon-a
+    DOCKER_IMAGE_TAG: "${DOCKER_REPOSITORY}:${CI_COMMIT_SHORT_SHA}"
 
 prod:
   extends: .deploy
   only:
     - prod
   variables:
     NAMESPACE: snippets-prod
-    CLUSTERS: frankfurt oregon-a
+    CLUSTERS: frankfurt-eks oregon-eks
+    DOCKER_IMAGE_TAG: "${DOCKER_REPOSITORY}:redirector-${CI_COMMIT_SHORT_SHA}"

bin/acceptance-tests-redirector.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+EXIT=0
+BASE_URL=${1:-https://snippets.mozilla.com}
+URLS=(
+    "/"
+    "/healthz/"
+
+    "/6/Firefox/62.0.1/20160922113459/WINNT_x86-msvc/en-US/release/Windows_NT%206.1/default/default/"
+)
+
+function check_http_code {
+    echo -n "Checking URL ${1} "
+    curl -k -L -s -o /dev/null -I -w "%{http_code}" $1 | grep ${2:-200} > /dev/null
+    if [ $? -eq 0 ];
+    then
+        echo "OK"
+    else
+        echo "Failed"
+        EXIT=1
+    fi
+}
+
+function check_zero_content_length {
+    echo -n "Checking zero content length of URL ${1} "
+    test=$(curl -L -s ${1} | wc -c);
+    if [[ $test -eq 0 ]];
+    then
+        echo "OK"
+    else
+        echo "Failed"
+        EXIT=1
+    fi
+}
+
+function check_empty_json {
+    echo -n "Checking empty json for URL ${1} "
+    test=$(curl -L -s ${1});
+    if [ $test = '{}' ];
+    then
+        echo "OK"
+    else
+        echo "Failed"
+        EXIT=1
+    fi
+}
+
+for url in ${URLS[*]}
+do
+    check_http_code ${BASE_URL}${url}
+done
+
+# Check a page that throws 404. Not ideal but will surface 500s
+check_http_code ${BASE_URL}/foo 404
+
+check_empty_json ${BASE_URL}/6/Firefox/56.0.1/20160922113459/WINNT_x86-msvc/xx/release/Windows_NT%206.1/default/default/
+
+exit ${EXIT}

bin/acceptance-tests.sh

@@ -5,6 +5,7 @@ URLS=(
     "/"
     "/healthz/"
     "/readiness/"
+    "/admin/"
     "/robots.txt"
     "/contribute.json"
     "/6/Firefox/62.0.1/20160922113459/WINNT_x86-msvc/en-US/release/Windows_NT%206.1/default/default/"

bin/update-config.sh

@@ -18,8 +18,8 @@ for CLUSTER in ${CLUSTERS}; do
     done
 done
 
-cp ${BIN_DIR}/acceptance-tests.sh .
-git add acceptance-tests.sh
+cp ${BIN_DIR}/acceptance-tests*.sh .
+git add acceptance-tests*.sh
 git commit -m "set image to ${DOCKER_IMAGE_TAG}" || echo "nothing new to commit"
 git push
 popd