dashboard-e2e: fix applitools BATCH_ID error

Signed-off-by: Ernesto Puerta <epuertat@redhat.com>

diff --git a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
index 35ecc98a230e789fde40987964423e65d0547fd1..2840062defaf48ec17c2b8fd2e465fe70100da66 100644 (file)
--- a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
+++ b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
@@ -66,6 +66,11 @@
             -  ../../../scripts/dashboard/{test_deps_script}
       - shell: |
           export CYPRESS_ARGS="--record --key $CYPRESS_RECORD_KEY --tag $JOB_NAME" COMMIT_INFO_MESSAGE="$JOB_NAME"
+          export APPLITOOLS_BATCH_ID="${{JOB_NAME}}_${{BUILD_TAG}}"
+          export APPLITOOLS_BRANCH_NAME="$ghprbSourceBranch"
+          export APPLITOOLS_PARENT_BRANCH_NAME="$ghprbTargetBranch"
+          mkdir -p .applitools
+          echo "$APPLITOOLS_BATCH_ID" > .applitools/BATCH_ID
           cd src/pybind/mgr/dashboard; timeout 2h ./{test_suite_script}
 
     wrappers:

diff --git a/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml b/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml
index 27cb993d8be430a01be924965271c874a1ac6da3..45a2249cc1579f7d0ed3937748d6af515c8a2e4e 100644 (file)
--- a/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml
+++ b/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml
@@ -68,6 +68,11 @@
             - ../../../scripts/dashboard/install-e2e-test-deps.sh
       - shell: |
           export CYPRESS_ARGS="--record --key $CYPRESS_RECORD_KEY --tag $ghprbTargetBranch" COMMIT_INFO_MESSAGE="$ghprbPullTitle"
+          export APPLITOOLS_BATCH_ID="PR-${ghprbPullId}_${BUILD_TAG}"
+          export APPLITOOLS_BRANCH_NAME="$ghprbSourceBranch"
+          export APPLITOOLS_PARENT_BRANCH_NAME="$ghprbTargetBranch"
+          mkdir -p .applitools
+          echo "$APPLITOOLS_BATCH_ID" > .applitools/BATCH_ID
           cd src/pybind/mgr/dashboard; timeout 7200 ./run-frontend-e2e-tests.sh
 
     wrappers: