From: Ernesto Puerta Date: Tue, 21 Sep 2021 09:26:04 +0000 (+0200) Subject: dashboard-e2e: fix applitools BATCH_ID error X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1908%2Fhead;p=ceph-build.git dashboard-e2e: fix applitools BATCH_ID error Signed-off-by: Ernesto Puerta --- diff --git a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml index 35ecc98a..2840062d 100644 --- 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 27cb993d..45a2249c 100644 --- 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: