From 22dc6440fc8578d6c7cb8e5b394a59831e100da7 Mon Sep 17 00:00:00 2001
From: Ernesto Puerta <epuertat@redhat.com>
Date: Mon, 28 Mar 2022 14:13:26 +0200
Subject: [PATCH] dashboard/nighlty: fix applitools baseline

Adds correct Branch to Nightly jobs.

Renames Batches with a more intuitive naming

Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
---
 .../config/definitions/ceph-api-nightly.yml          | 12 ++++++++++--
 .../definitions/ceph-dashboard-pull-requests.yml     |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
index 4a145bc7..80de662b 100644
--- a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
+++ b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
@@ -67,8 +67,8 @@
       - 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"
+          export APPLITOOLS_BATCH_NAME="Nightly-${{GIT_BRANCH#*/}}"
+          export APPLITOOLS_BRANCH_NAME="${{GIT_BRANCH#*/}}"
           mkdir -p .applitools
           echo "$APPLITOOLS_BATCH_ID" > .applitools/BATCH_ID
           cd src/pybind/mgr/dashboard; timeout 2h ./{test_suite_script}
@@ -84,6 +84,14 @@
           - text:
               credential-id: cd-applitools-api-key
               variable: APPLITOOLS_API_KEY
+      - raw:
+          xml: |
+            <com.applitools.jenkins.ApplitoolsBuildWrapper plugin="applitools-eyes@1.13">
+              <serverURL>https://eyes.applitools.com</serverURL>
+              <notifyByCompletion>true</notifyByCompletion>
+              <applitoolsApiKey/>
+            </com.applitools.jenkins.ApplitoolsBuildWrapper>
+ 
       - ansicolor
 
     publishers:
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 5854edf1..58de076d 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
@@ -69,6 +69,7 @@
       - 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_BATCH_NAME="PR-${ghprbPullId}"
           export APPLITOOLS_BRANCH_NAME="$ghprbSourceBranch"
           export APPLITOOLS_PARENT_BRANCH_NAME="$ghprbTargetBranch"
           mkdir -p .applitools
-- 
2.39.5