CI: Fix localdb e2e test outside PR context

Local e2e test were working on PRs but not when running on the branch.
cBioPortal · Nov 23, 2019 · 5743e18 · 5743e18
1 parent a3deedc
commit 5743e18
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -90,12 +90,19 @@ jobs:
                 name: Setup python libraries
                 command: |
                     pip3 install requests pyyaml
+            - run:
+                name: Indicate what backend image to run against
+                command: |
+                    if [[ -n "${CIRCLE_PR_USERNAME}" ]]; then \
+                        sed -i '/BACKEND.*/d' env/custom.sh && \
+                        echo -e "\nexport BACKEND=$CIRCLE_PR_USERNAME:$CIRCLE_SHA1" >> $PORTAL_SOURCE_DIR/env/custom.sh; \
+                    else \
+                        echo -e "\nexport BACKEND=$CIRCLE_PROJECT_USERNAME:$CIRCLE_SHA1" >> $PORTAL_SOURCE_DIR/env/custom.sh; \
+                    fi
             - run:
                 name: Setup e2e-environment
                 command: |
-                    sed -i '/BACKEND.*/d' env/custom.sh && \
-                    echo -e "\nexport BACKEND=$CIRCLE_PR_USERNAME:$CIRCLE_SHA1" >> $PORTAL_SOURCE_DIR/env/custom.sh && \
-                    source $PORTAL_SOURCE_DIR/env/custom.sh || true && \
+                    source $PORTAL_SOURCE_DIR/env/custom.sh && \
                     cd $TEST_HOME/local/runtime-config && \
                     ./setup_environment.sh && ./setup_environment.sh >> $BASH_ENV
             - run: