TASK: Passthru the target branch

neos · Sep 19, 2024 · e849cdd · e849cdd
1 parent 8905c2e
commit e849cdd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -101,11 +101,6 @@ jobs:
           name: Login to GitHub
           command: |
             echo $AUTH_TOKEN_GITHUB | gh auth login --with-token
-      - run:
-          name: Define target branch
-          command: |
-            TARGET_BRANCH=$(gh pr view $CIRCLE_PULL_REQUEST --json baseRefName --jq '.baseRefName')
-            echo "Target Branch: $TARGET_BRANCH"
       - run:
           name: Install Sauce Connect
           command: |
@@ -131,13 +126,23 @@ jobs:
           background: true
           command: sc run --username ${SAUCE_USERNAME} --access-key ${SAUCE_ACCESS_KEY} --tunnel-name "circleci-tunnel" --region "us-west-1" --proxy-localhost allow
       - run:
+          name: Define target branch
+          command: |
+            TARGET_BRANCH=$(gh pr view $CIRCLE_PULL_REQUEST --json baseRefName --jq '.baseRefName')
+            echo "Target Branch: $TARGET_BRANCH"
+            # Save the variable to BASH_ENV to be able to access it in the next steps
+            echo "export TARGET_BRANCH=$TARGET_BRANCH" >> $BASH_ENV
+      - run:
+          name: Prepare and run e2e tests
           no_output_timeout: 30m
           command: |
+            echo "Using target branch: $TARGET_BRANCH"
             export NVM_DIR="$HOME/.nvm"
             [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
             cd /home/circleci/app/Packages/Application/Neos.Neos.Ui
             nvm install
             nvm use
+            echo "Target Branch: $TARGET_BRANCH"
             make test-e2e-saucelabs
       - store_artifacts:
           path: /home/circleci/app/Data/Logs

diff --git a/.sauce/config1Dimension.yml b/.sauce/config1Dimension.yml
@@ -12,6 +12,8 @@ sauce:
     build: Release $CI_COMMIT_SHORT_SHA
   tunnel:
     name: "circleci-tunnel"
+env:
+  branch: $TARGET_BRANCH
 testcafe:
   version: 3.6.2
 # Controls what files are available in the context of a test run (unless explicitly excluded by .sauceignore).

diff --git a/Tests/IntegrationTests/e2e-saucelabs.sh b/Tests/IntegrationTests/e2e-saucelabs.sh
@@ -49,6 +49,7 @@ for fixture in Packages/Application/Neos.Neos.Ui/Tests/IntegrationTests/Fixtures
     ./flow resource:publish
 
     cd Packages/Application/Neos.Neos.Ui
+    echo "Running saucectl with config .sauce/config${dimension}.yml for $TARGET_BRANCH"
     saucectl run --config .sauce/config${dimension}.yml
     cd ../../..
     rm -f DistributionPackages/Neos.TestSite