From a0b4419726bcd50bb9d71738c5637354a5a8280c Mon Sep 17 00:00:00 2001 From: Plakhota <90543395+Plakhota@users.noreply.github.com> Date: Mon, 12 Jun 2023 19:02:31 +0300 Subject: [PATCH 1/5] Update azure-pipelines.yml for Azure Pipelines https://trello.com/c/QDUmKABm/1100-ics-ado-extensiongithub-integration --- azure-pipelines.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8fa1b91..5d89cff 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,25 +11,27 @@ pool: - - steps: - task: NodeTool@0 inputs: versionSpec: '10.x' displayName: 'Install Node.js' -# - task: ApplitoolsBuildTask@0 -# displayName: 'Applitools Build Task' -# inputs: -# eyesBaseUrl: "https://eyes.applitools.com" - +- task: ApplitoolsBuildTask@0 + displayName: 'Applitools Build Task' + inputs: + eyesBaseUrl: "https://testeyes.applitools.com" + env: + APPLITOOLS_SERVER_URL: "https://testeyes.applitools.com" - script: | + export ADO_BATCH_ID=$APPLITOOLS_BATCH_ID + export APPLITOOLS_BATCH_ID=$APPLITOOLS_BATCH_ID_FOR_GH + curl --location 'https://testeyes.applitools.com/api/sessions/batches/bindpointers/$APPLITOOLS_BATCH_ID?apiKey=$APPLITOOLS_API_KEY'\ + --header 'Content-Type: application/json' --data '{ "secondaryBatchPointerId": "$ADO_BATCH_ID"}' npm install npm test - #npm run build - displayName: 'npm install and build ' - env: - APPLITOOLS_API_KEY: $(APPLITOOLS_API_KEY) - APPLITOOLS_BATCH_ID: $(System.PullRequest.SourceCommitId) + displayName: 'npm install and build' + env: + APPLITOOLS_API_KEY: $(_testeyes_applitools_api_key) + APPLITOOLS_BATCH_ID_FOR_GH: $(azure-pipelines-System.PullRequest.SourceCommitId) From aebb8630323abc1d95bebd5453e5d66f98b29777 Mon Sep 17 00:00:00 2001 From: Plakhota <90543395+Plakhota@users.noreply.github.com> Date: Mon, 12 Jun 2023 19:12:08 +0300 Subject: [PATCH 2/5] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5d89cff..511f3d3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,10 +25,10 @@ steps: APPLITOOLS_SERVER_URL: "https://testeyes.applitools.com" - script: | - export ADO_BATCH_ID=$APPLITOOLS_BATCH_ID - export APPLITOOLS_BATCH_ID=$APPLITOOLS_BATCH_ID_FOR_GH - curl --location 'https://testeyes.applitools.com/api/sessions/batches/bindpointers/$APPLITOOLS_BATCH_ID?apiKey=$APPLITOOLS_API_KEY'\ - --header 'Content-Type: application/json' --data '{ "secondaryBatchPointerId": "$ADO_BATCH_ID"}' + # export ADO_BATCH_ID=$APPLITOOLS_BATCH_ID + # export APPLITOOLS_BATCH_ID=$APPLITOOLS_BATCH_ID_FOR_GH + # curl --location 'https://testeyes.applitools.com/api/sessions/batches/bindpointers/$APPLITOOLS_BATCH_ID?apiKey=$APPLITOOLS_API_KEY'\ + # --header 'Content-Type: application/json' --data '{ "secondaryBatchPointerId": "$ADO_BATCH_ID"}' npm install npm test displayName: 'npm install and build' From 98a36ec78f363214232ca7f79aad6f30646fe8d3 Mon Sep 17 00:00:00 2001 From: Plakhota <90543395+Plakhota@users.noreply.github.com> Date: Mon, 12 Jun 2023 19:21:44 +0300 Subject: [PATCH 3/5] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 511f3d3..5d89cff 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,10 +25,10 @@ steps: APPLITOOLS_SERVER_URL: "https://testeyes.applitools.com" - script: | - # export ADO_BATCH_ID=$APPLITOOLS_BATCH_ID - # export APPLITOOLS_BATCH_ID=$APPLITOOLS_BATCH_ID_FOR_GH - # curl --location 'https://testeyes.applitools.com/api/sessions/batches/bindpointers/$APPLITOOLS_BATCH_ID?apiKey=$APPLITOOLS_API_KEY'\ - # --header 'Content-Type: application/json' --data '{ "secondaryBatchPointerId": "$ADO_BATCH_ID"}' + export ADO_BATCH_ID=$APPLITOOLS_BATCH_ID + export APPLITOOLS_BATCH_ID=$APPLITOOLS_BATCH_ID_FOR_GH + curl --location 'https://testeyes.applitools.com/api/sessions/batches/bindpointers/$APPLITOOLS_BATCH_ID?apiKey=$APPLITOOLS_API_KEY'\ + --header 'Content-Type: application/json' --data '{ "secondaryBatchPointerId": "$ADO_BATCH_ID"}' npm install npm test displayName: 'npm install and build' From 5a11b51bc2ca2f5f24f329315a9b270cfb1afcbd Mon Sep 17 00:00:00 2001 From: Plakhota <90543395+Plakhota@users.noreply.github.com> Date: Mon, 12 Jun 2023 19:25:43 +0300 Subject: [PATCH 4/5] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5d89cff..ab755f1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -27,8 +27,7 @@ steps: - script: | export ADO_BATCH_ID=$APPLITOOLS_BATCH_ID export APPLITOOLS_BATCH_ID=$APPLITOOLS_BATCH_ID_FOR_GH - curl --location 'https://testeyes.applitools.com/api/sessions/batches/bindpointers/$APPLITOOLS_BATCH_ID?apiKey=$APPLITOOLS_API_KEY'\ - --header 'Content-Type: application/json' --data '{ "secondaryBatchPointerId": "$ADO_BATCH_ID"}' + curl --location 'https://testeyes.applitools.com/api/sessions/batches/bindpointers/$APPLITOOLS_BATCH_ID?apiKey=$APPLITOOLS_API_KEY' --header 'Content-Type: application/json' --data '{ "secondaryBatchPointerId": "$ADO_BATCH_ID"}' npm install npm test displayName: 'npm install and build' From 0301b98603763e32671e6c0e17872314b078f900 Mon Sep 17 00:00:00 2001 From: Plakhota <90543395+Plakhota@users.noreply.github.com> Date: Mon, 12 Jun 2023 19:28:29 +0300 Subject: [PATCH 5/5] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ab755f1..474cd7a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -27,7 +27,7 @@ steps: - script: | export ADO_BATCH_ID=$APPLITOOLS_BATCH_ID export APPLITOOLS_BATCH_ID=$APPLITOOLS_BATCH_ID_FOR_GH - curl --location 'https://testeyes.applitools.com/api/sessions/batches/bindpointers/$APPLITOOLS_BATCH_ID?apiKey=$APPLITOOLS_API_KEY' --header 'Content-Type: application/json' --data '{ "secondaryBatchPointerId": "$ADO_BATCH_ID"}' + # curl --location 'https://testeyes.applitools.com/api/sessions/batches/bindpointers/$APPLITOOLS_BATCH_ID?apiKey=$APPLITOOLS_API_KEY' --header 'Content-Type: application/json' --data '{ "secondaryBatchPointerId": "$ADO_BATCH_ID"}' npm install npm test displayName: 'npm install and build'