Better handling of environment variables in circle

Author: ddworken

.circleci/config.yml

@@ -5,7 +5,6 @@ jobs:
       image: circleci/classic:latest
     steps:
       - checkout
-      - run: "./.circleci/init-env.sh > tests/env.sh"
       - run: "./integrationTest.sh"
   unit:
     docker:

.circleci/init-env.sh

@@ -7,14 +7,13 @@ set +u
 if [ -z "$CIRCLECI" ]; then
   go test ./... 2>&1 | grep -v 'no test files'
 fi
-set -u
 
-if [[ -f "tests/env.sh" ]]; then
-    echo "env.sh file already exists, skipping configuring new accounts..."
+if [[ -f "tests/env.sh" ]] || [ -z "$CIRCLECI" ]; then
+    echo "env.sh already configured, skipping configuring new accounts..."
 else
     python3 tests/configure_accounts.py
 fi
-
+set -u
 
 # Some colors for pretty output
 RED='\033[0;31m'

integrationTest.sh

@@ -7,7 +7,6 @@ IFS=$'\n\t'
 touch /shared/.keep
 
 # Generate the env files that will be used for tests
-source tests/env.sh
 mkdir -p tests/generated-env
 ls tests/envFiles/ | xargs -I {} -- bash -c 'cat tests/envFiles/{} | envsubst > tests/generated-env/{}'
 

tests/bot-entrypoint.sh

@@ -9,6 +9,7 @@ services:
     environment:
       - BOT_PAPERKEY
       - BOT_USERNAME
+      - SUBTEAM
     volumes:
       - app-volume:/shared/
     user: root

tests/docker-compose.yml

@@ -1,2 +1,3 @@
 The files in this directory are env files used to run the CA bot. The files are filled in based on
-the values of environment variables `SUBTEAM`, `BOT_USERNAME`, and `BOT_PAPERKEY` from tests/env.sh.
+the values of environment variables `SUBTEAM`, `BOT_USERNAME`, and `BOT_PAPERKEY`. When running
+locally, these environment variables are stored in tests/env.sh.