more fixes to CI

Author: lestex

.circleci/ci_integration.sh

@@ -13,21 +13,25 @@ finish() {
 setup_environment() {
   local tmpfile
   tmpfile="$(mktemp)"
-  echo "${SERVICE_ACCOUNT_JSON}" > "${tmpfile}"
+
+  echo "$GOOGLE_APPLICATION_CREDENTIALS" > "${tmpfile}"
 
   # Terraform and most other tools respect GOOGLE_CREDENTIALS
-  export GOOGLE_CREDENTIALS="${SERVICE_ACCOUNT_JSON}"
+  export GOOGLE_CREDENTIALS="$GOOGLE_APPLICATION_CREDENTIALS"          
+
   # gcloud variables
-  export CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE="${tmpfile}"
   export CLOUDSDK_CORE_PROJECT="${PROJECT_ID}"
   export GOOGLE_APPLICATION_CREDENTIALS="${tmpfile}"
+  gcloud auth activate-service-account --key-file="${tmpfile}"
+  gcloud compute networks list --format=json
 
   # Terraform input variables
   export TF_VAR_project_id="${PROJECT_ID}"
   TF_VAR_random_string_for_testing="${RANDOM_STRING_FOR_TESTING:-$(LC_ALL=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 5 | head -n 1)}"
   export TF_VAR_random_string_for_testing
 
-  gcloud auth activate-service-account --key-file "$GOOGLE_APPLICATION_CREDENTIALS"
+  # Setup auth for service account
+  gcloud auth activate-service-account --key-file="${tmpfile}"
 }
 
 main() {
@@ -38,9 +42,9 @@ main() {
 
   # Setup environment
   setup_environment
+
   set -x
   # Execute the test lifecycle
-  bundle install --path vendor
   bundle exec kitchen create
   bundle exec kitchen converge -c 4
   bundle exec kitchen verify

.circleci/config.yml

@@ -21,7 +21,7 @@ jobs:
   run-tests:
     <<: *docker
     environment:
-      BUNDLE_PATH: vendor
+      BUNDLE_PATH: vendor      
 
     steps:
       - checkout
@@ -37,8 +37,8 @@ jobs:
           paths:
             - vendor
       - run:
-          name: Run test command
-          command: echo ${CIRCLE_PROJECT_REPONAME}
+          name: Run test-kitchen cicle
+          command: .circleci/ci_integration.sh
 
 workflows:
   version: 2