tests: fix environment test issues (#181)

Author: daniel-sanche

packages/google-cloud-logging/.kokoro/environment_tests.sh

@@ -43,6 +43,9 @@ gcloud auth activate-service-account --key-file=$GOOGLE_APPLICATION_CREDENTIALS
 export PROJECT_ID=$(cat "${KOKORO_GFILE_DIR}/project-id.json")
 gcloud config set project $PROJECT_ID
 
+# set a default zone.
+gcloud config set compute/zone us-central1-b
+
 # authenticate docker
 gcloud auth configure-docker -q
 
@@ -53,6 +56,15 @@ python3.6 -m pip uninstall --yes --quiet nox-automation
 python3.6 -m pip install --upgrade --quiet nox
 python3.6 -m nox --version
 
+# Install kubectl
+if [[ "${ENVIRONMENT}" == "kubernetes" ]]; then
+  curl -LO https://dl.k8s.io/release/v1.20.0/bin/linux/amd64/kubectl
+  chmod +x kubectl
+  mkdir -p ~/.local/bin
+  mv ./kubectl ~/.local/bin
+  export PATH=$PATH:~/.local/bin
+fi
+
 # create a unique id for this run
 UUID=$(python  -c 'import uuid; print(uuid.uuid1())' | head -c 7)
 export ENVCTL_ID=ci-$UUID

packages/google-cloud-logging/tests/environment/envctl/env_scripts/python/appengine_standard.sh

@@ -73,6 +73,14 @@ EOF
   pushd $TMP_DIR
     gcloud app deploy -q
   popd
+  # wait for the pub/sub subscriber to start
+  NUM_SUBSCRIBERS=0
+  TRIES=0
+  while [[ "${NUM_SUBSCRIBERS}" -lt 1 && "${TRIES}" -lt 10 ]]; do
+    sleep 30
+    NUM_SUBSCRIBERS=$(gcloud pubsub topics list-subscriptions $SERVICE_NAME 2> /dev/null | wc -l)
+    TRIES=$((TRIES + 1))
+  done
 }
 
 filter-string() {

packages/google-cloud-logging/tests/environment/envctl/env_scripts/python/compute.sh

@@ -47,10 +47,19 @@ verify() {
 
 deploy() {
   build_container
-  gcloud beta compute instances create-with-container \
+  gcloud compute instances create-with-container \
     $SERVICE_NAME \
     --container-image $GCR_PATH \
     --container-env PUBSUB_TOPIC="$SERVICE_NAME",ENABLE_SUBSCRIBER="true"
+  # wait for the pub/sub subscriber to start
+  NUM_SUBSCRIBERS=0
+  TRIES=0
+  while [[ "${NUM_SUBSCRIBERS}" -lt 1 && "${TRIES}" -lt 10 ]]; do
+    sleep 30
+    NUM_SUBSCRIBERS=$(gcloud pubsub topics list-subscriptions $SERVICE_NAME 2> /dev/null | wc -l)
+    TRIES=$((TRIES + 1))
+  done
+
 }
 
 filter-string() {

packages/google-cloud-logging/tests/environment/envctl/env_scripts/python/kubernetes.sh

@@ -35,6 +35,11 @@ destroy() {
 
 verify() {
   set +e
+  gcloud pubsub subscriptions describe $SERVICE_NAME-subscriber 2> /dev/null
+  if [[ $? != 0 ]]; then
+     echo "FALSE"
+     exit 1
+  fi
   gcloud container clusters describe --zone $ZONE $SERVICE_NAME > /dev/null 2> /dev/null
   if [[ $? == 0 ]]; then
      echo "TRUE"
@@ -93,6 +98,16 @@ EOF
   set -e
   # deploy test container
   kubectl apply -f $TMP_DIR
+  # wait for pod to spin up
+  kubectl wait --for=condition=ready pod -l app=$SERVICE_NAME
+  # wait for the pub/sub subscriber to start
+  NUM_SUBSCRIBERS=0
+  TRIES=0
+  while [[ "${NUM_SUBSCRIBERS}" -lt 1 && "${TRIES}" -lt 10 ]]; do
+    sleep 30
+    NUM_SUBSCRIBERS=$(gcloud pubsub topics list-subscriptions $SERVICE_NAME 2> /dev/null | wc -l)
+    TRIES=$((TRIES + 1))
+  done
 }
 
 filter-string() {

packages/google-cloud-logging/tests/environment/noxfile.py

@@ -124,7 +124,7 @@ def blacken(session: nox.sessions.Session) -> None:
         "appengine_standard",
         "appengine_flex_python",
         "appengine_flex_container",
-        "kubernetesengine",
+        "kubernetes",
         "cloudrun",
         "functions",
     ],

tests/environment

@@ -1 +1 @@
-Subproject commit aec50a9122b0ff3a41c20925d171d51d948f4b80
+Subproject commit e4cab8acdbf0054a9e4b5b3b3a2bbc68f108d982