Move generation of secrets

Author: rjeberhard

src/integration-tests/bash/run.sh

@@ -566,6 +566,35 @@ function create_image_pull_secret_jenkins {
 
 }
 
+function create_image_pull_secret_wercker {
+
+    trace "Creating Docker Secret"
+    kubectl create secret docker-registry $IMAGE_PULL_SECRET_WEBLOGIC  \
+    --docker-server=index.docker.io/v1/ \
+    --docker-username=$DOCKER_USERNAME \
+    --docker-password=$DOCKER_PASSWORD \
+    --docker-email=$DOCKER_EMAIL 2>&1 | sed 's/^/+' 2>&1
+
+    trace "Checking Secret"
+    local SECRET="`kubectl get secret $IMAGE_PULL_SECRET_WEBLOGIC | grep $IMAGE_PULL_SECRET_WEBLOGIC | wc | awk ' { print $1; }'`"
+    if [ "$SECRET" != "1" ]; then
+        fail 'secret $IMAGE_PULL_SECRET_WEBLOGIC was not created successfully'
+    fi
+
+    trace "Creating Registry Secret"
+    kubectl create secret docker-registry $IMAGE_PULL_SECRET_OPERATOR  \
+    --docker-server=$REPO_REGISTRY \
+    --docker-username=$REPO_USERNAME \
+    --docker-password=$REPO_PASSWORD 2>&1 | sed 's/^/+' 2>&1
+
+    trace "Checking Secret"
+    local SECRET="`kubectl get secret $IMAGE_PULL_SECRET_OPERATOR | grep $IMAGE_PULL_SECRET_OPERATOR | wc | awk ' { print $1; }'`"
+    if [ "$SECRET" != "1" ]; then
+        fail 'secret $IMAGE_PULL_SECRET_OPERATOR was not created successfully'
+    fi
+
+}
+
 # op_define OP_KEY NAMESPACE TARGET_NAMESPACES EXTERNAL_REST_HTTPSPORT
 #   sets up table of operator values.
 #
@@ -2577,6 +2606,8 @@ function test_suite_init {
 
       mkdir -p $RESULT_ROOT/acceptance_test_tmp || fail "Could not mkdir -p RESULT_ROOT/acceptance_test_tmp (RESULT_ROOT=$RESULT_ROOT)"
 
+      create_image_pull_secret_wercker
+      
     elif [ "$JENKINS" = "true" ]; then
 
       trace "Test Suite is running on Jenkins and k8s is running locally on the same node."

wercker.yml

@@ -163,71 +163,20 @@ integration-test:
       $WERCKER_SOURCE_DIR/src/integration-tests/bash/lease.sh -o "$LEASE_ID" -t $((100 * 60))
       echo @@
 
-      # create pull secrets
-      echo @@ "Creating pull secrets"
-      kubectl delete secret docker-store --ignore-not-found=true
-      kubectl create secret docker-registry docker-store --docker-server=index.docker.io/v1/ --docker-username=$DOCKER_USERNAME --docker-password=$DOCKER_PASSWORD --docker-email=$DOCKER_EMAIL
-
       export HOST_PATH="/scratch"
       export PV_ROOT=$HOST_PATH
       export RESULT_ROOT="$WERCKER_OUTPUT_DIR/k8s_dir"
       mkdir -m 777 -p $RESULT_ROOT
       export PROJECT_ROOT="${WERCKER_SOURCE_DIR}"
       $WERCKER_SOURCE_DIR/src/integration-tests/bash/cleanup.sh
 
-      # create pull secrets
-      echo @@ "Creating pull secrets"
-      kubectl delete secret docker-store --ignore-not-found=true
-      kubectl create secret docker-registry docker-store --docker-server=index.docker.io/v1/ --docker-username=$DOCKER_USERNAME --docker-password=$DOCKER_PASSWORD --docker-email=$DOCKER_EMAIL
-      
-      if [ `kubectl get ns test1 | grep Error | wc -l` = 0 ]; then
-        kubectl delete ns test1 --ignore-not-found=true
-        while [`kubectl get ns test1 -o jsonpath='{.status.phase}' | grep Terminating | wc -l` = 1 ]; do
-          sleep 5
-        done
-      fi
-      kubectl create ns test1
-      if [ `kubectl get ns test2 | grep Error | wc -l` = 0 ]; then
-        kubectl delete ns test2 --ignore-not-found=true
-        while [`kubectl get ns test2 -o jsonpath='{.status.phase}' | grep Terminating | wc -l` = 1 ]; do
-          sleep 5
-        done
-      fi
-      kubectl create ns test2
-      if [ `kubectl get ns weblogic-operator-1 | grep Error | wc -l` = 0 ]; then
-        kubectl delete ns weblogic-operator-1 --ignore-not-found=true
-        while [`kubectl get ns weblogic-operator-1 -o jsonpath='{.status.phase}' | grep Terminating | wc -l` = 1 ]; do
-          sleep 5
-        done
-      fi
-      kubectl create ns weblogic-operator-1
-      if [ `kubectl get ns weblogic-operator-2 | grep Error | wc -l` = 0 ]; then
-        kubectl delete ns weblogic-operator-2 --ignore-not-found=true
-        while [`kubectl get ns weblogic-operator-2 -o jsonpath='{.status.phase}' | grep Terminating | wc -l` = 1 ]; do
-          sleep 5
-        done
-      fi
-      kubectl create ns weblogic-operator-2
-      
-      kubectl delete secret docker-store -n test1 --ignore-not-found=true
-      kubectl create secret docker-registry docker-store -n test1 --docker-server=index.docker.io/v1/ --docker-username=$DOCKER_USERNAME --docker-password=$DOCKER_PASSWORD --docker-email=$DOCKER_EMAIL
-
-      kubectl delete secret docker-store -n test2 --ignore-not-found=true
-      kubectl create secret docker-registry docker-store -n test2 --docker-server=index.docker.io/v1/ --docker-username=$DOCKER_USERNAME --docker-password=$DOCKER_PASSWORD --docker-email=$DOCKER_EMAIL
-      
-      kubectl delete secret test-registry -n weblogic-operator-1 --ignore-not-found=true
-      kubectl create secret docker-registry test-registry -n weblogic-operator-1 --docker-server=$REPO_REGISTRY --docker-username=$REPO_USERNAME --docker-password=$REPO_PASSWORD
-
-      kubectl delete secret test-registry -n weblogic-operator-2 --ignore-not-found=true
-      kubectl create secret docker-registry test-registry -n weblogic-operator-2 --docker-server=$REPO_REGISTRY --docker-username=$REPO_USERNAME --docker-password=$REPO_PASSWORD
-
       export IMAGE_NAME_OPERATOR="${REPO_REPOSITORY}"
       export IMAGE_TAG_OPERATOR="${WERCKER_GIT_BRANCH//[_\/]/-}"
       if [ "$IMAGE_TAG_OPERATOR" = "master" ]; then
         export IMAGE_TAG_OPERATOR="latest"
       fi
       export IMAGE_PULL_POLICY_OPERATOR="Always"
-      export IMAGE_PULL_SECRET_OPERATOR="test-registry"
+      export IMAGE_PULL_SECRET_OPERATOR="ocir-registry"
       export IMAGE_PULL_SECRET_WEBLOGIC="docker-store"
 
       echo "Integration test suite against the test image which is:"