From 0a270a25f353bdaa07545dcb3fdfd480d598830c Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Tue, 25 Oct 2022 02:22:04 +0300 Subject: [PATCH 01/18] adding prod msal with dev brokerhost pipeline --- .../msal-brokerProd-to-DevBroker-nightly.yml | 148 ++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml new file mode 100644 index 000000000..1a3109083 --- /dev/null +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -0,0 +1,148 @@ +# run MSAL with Broker UI automation testcases +# Variable: 'ENV_VSTS_MVN_ANDROIDADACCOUNTS_USERNAME' was defined in the Variables tab +# Variable: 'gCloudProjectId' was defined in the Variables tab +# Variable: 'mvnAccessToken' was defined in the Variables tab +name: $(Build.BuildId)_$(Build.DefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r) + +trigger: none +pr: none + +schedules: + - cron: "0 5 * * 1-6" # 5:00 AM UTC everyday Mon-Sat + displayName: Daily Local MSAL UI Automation with Prod Broker Run + branches: + include: + - dev + always: true + +parameters: + - name: firebaseDeviceId + type: string + displayName: Firebase Device Id + default: blueline + values: + - blueline + - flame + - redfin + - sailfish + - walleye + - bluejay + - oriole + - name: firebaseDeviceAndroidVersion + displayName: Firebase Device Android Version + type: number + default: 28 + values: + - 25 + - 26 + - 27 + - 28 + - 29 + - 30 + - 31 + - 32 + - 33 + - name: testTargetPackages + displayName: Packages as Test Targets + type: string + default: package com.microsoft.identity.client.msal.automationapp.testpass.broker, notAnnotation org.junit.Ignore + - name: oldBrokerHostVersion + displayName: Old Broker host Version + type: string + default: '0.0.1' + - name: msalVersion + displayName: MSAL Version + type: string + +variables: + engineeringProjectId: 'fac9d424-53d2-45c0-91b5-ef6ba7a6bf26' + azureSamplePipelineId: 1458 + brokerHostPipelineId: 1432 + msazureServiceConnection: AndroidBroker-CI + msazureFeedName: Android-Broker + azureSampleApk: AzureSample-local-debug.apk + brokerHostApk: brokerHost-local-debug.apk + oldBrokerHostApk: brokerHost-local-debug.apk + firebaseTimeout: 45m + +stages: + # msalautomationapp + - stage: 'msalautomationapp' + displayName: Build MSAL Automation APKs + jobs: + - template: ./templates/build-msal-automation-app.yml + parameters: + brokerFlavor: BrokerHost + msalFlavor: Dist + brokerSource: LocalApk + msalVersion: ${{ parameters.msalVersion }} + # Brokers + - stage: 'brokers' + dependsOn: [] # this removes the implicit dependency on previous stage and causes this to run in parallel + displayName: Brokers and Azure Sample APKs + jobs: + - job: 'download_brokers' + displayName: Download Brokers + pool: + vmImage: ubuntu-latest + steps: + - checkout: none + - task: DownloadPipelineArtifact@2 + displayName: 'Download latest Azure Sample' + inputs: + buildType: 'specific' + project: '$(engineeringProjectId)' + definition: '$(azureSamplePipelineId)' + artifactName: AzureSample + itemPattern: '**/*.apk' + targetPath: '$(Build.ArtifactStagingDirectory)/azureSample' + buildVersionToDownload: 'latest' + - task: DownloadPipelineArtifact@2 + displayName: 'Download Broker Host' + inputs: + buildType: specific + project: '$(engineeringProjectId)' + definition: '$(brokerHostPipelineId)' + artifactName: BrokerHost + itemPattern: '**/*.apk' + targetPath: '$(Build.ArtifactStagingDirectory)/brokerHost' + - task: UniversalPackages@0 + displayName: 'Download old brokerHost version from feed' + inputs: + command: 'download' + downloadDirectory: '$(Build.ArtifactStagingDirectory)/oldBrokerHost' + feedsToUse: 'external' + externalFeedCredentials: '$(msazureServiceConnection)' + feedDownloadExternal: '$(msazureFeedName)' + packageDownloadExternal: 'broker-host' + versionDownloadExternal: '${{ parameters.oldBrokerHostVersion }}' + + - publish: $(Build.ArtifactStagingDirectory)/azureSample + displayName: 'Publish Azure Sample apk for later use' + artifact: azureSample + - publish: $(Build.ArtifactStagingDirectory)/brokerHost + displayName: 'Publish Broker Host apk for later use' + artifact: brokerHost + - publish: $(Build.ArtifactStagingDirectory)/oldBrokerHost + displayName: 'Publish Broker Host old apk for later use' + artifact: oldBrokerHost + # MSAL with Broker Test Plan stage + - stage: 'msal_with_broker' + dependsOn: + - msalautomationapp + - brokers + displayName: Running MSAL with Broker Test UI Test Suite + jobs: + - template: ./templates/flank/run-on-firebase-with-flank.yml + parameters: + automationAppApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-local-AutoBroker-debug.apk" + automationAppTestApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-local-AutoBroker-debug-androidTest.apk" + testTargetPackages: ${{ parameters.testTargetPackages }} + resultsHistoryName: "Prod MSAL with Dev Broker (BrokerHost)" + otherFiles: "/data/local/tmp/BrokerHost.apk=$(Pipeline.Workspace)/brokerHost/$(brokerHostApk),\ + /data/local/tmp/OldBrokerHost.apk=$(Pipeline.Workspace)/oldBrokerHost/$(oldBrokerHostApk),\ + /data/local/tmp/AzureSample.apk=$(Pipeline.Workspace)/azureSample/$(azureSampleApk)" + resultsDir: "msal-BrokerHost-$(Build.BuildId)-$(Build.BuildNumber)" + firebaseDeviceId: ${{ parameters.firebaseDeviceId }} + firebaseDeviceAndroidVersion: ${{ parameters.firebaseDeviceAndroidVersion }} +... \ No newline at end of file From e6ef5709d17819282fa696645f70d06e5d38fd84 Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Tue, 25 Oct 2022 02:37:12 +0300 Subject: [PATCH 02/18] fix indentation. --- .../ui-automation/msal-brokerProd-to-DevBroker-nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index 1a3109083..5ef8e4313 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -51,8 +51,8 @@ parameters: type: string default: '0.0.1' - name: msalVersion - displayName: MSAL Version - type: string + displayName: MSAL Version + type: string variables: engineeringProjectId: 'fac9d424-53d2-45c0-91b5-ef6ba7a6bf26' From a724a68e7f3811236d4192e8dfafbddf96de3f15 Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Mon, 31 Oct 2022 01:49:08 +0300 Subject: [PATCH 03/18] use msalautomationapp:assembleDistAutoBrokerDebug --- .../ui-automation/msal-brokerProd-to-DevBroker-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index 5ef8e4313..ae034a376 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -72,7 +72,7 @@ stages: jobs: - template: ./templates/build-msal-automation-app.yml parameters: - brokerFlavor: BrokerHost + brokerFlavor: AutoBroker msalFlavor: Dist brokerSource: LocalApk msalVersion: ${{ parameters.msalVersion }} From 4f9910d7230bfe91426c9528388cbca8864c2614 Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Mon, 31 Oct 2022 01:57:42 +0300 Subject: [PATCH 04/18] use dist flavour for the msalautoamtionapp apk --- .../ui-automation/msal-brokerProd-to-DevBroker-nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index ae034a376..a64f005dc 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -135,8 +135,8 @@ stages: jobs: - template: ./templates/flank/run-on-firebase-with-flank.yml parameters: - automationAppApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-local-AutoBroker-debug.apk" - automationAppTestApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-local-AutoBroker-debug-androidTest.apk" + automationAppApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-dist-AutoBroker-debug.apk" + automationAppTestApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-dist-AutoBroker-debug-androidTest.apk" testTargetPackages: ${{ parameters.testTargetPackages }} resultsHistoryName: "Prod MSAL with Dev Broker (BrokerHost)" otherFiles: "/data/local/tmp/BrokerHost.apk=$(Pipeline.Workspace)/brokerHost/$(brokerHostApk),\ From ee8016459a47769fcaef3e84876c20ae4105096b Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Mon, 31 Oct 2022 13:49:15 +0300 Subject: [PATCH 05/18] only alteration needed is to provide msalVersion --- .../msal-brokerProd-to-DevBroker-nightly.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index a64f005dc..d494cba9a 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -72,8 +72,8 @@ stages: jobs: - template: ./templates/build-msal-automation-app.yml parameters: - brokerFlavor: AutoBroker - msalFlavor: Dist + brokerFlavor: BrokerHost + msalFlavor: Local brokerSource: LocalApk msalVersion: ${{ parameters.msalVersion }} # Brokers @@ -135,8 +135,8 @@ stages: jobs: - template: ./templates/flank/run-on-firebase-with-flank.yml parameters: - automationAppApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-dist-AutoBroker-debug.apk" - automationAppTestApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-dist-AutoBroker-debug-androidTest.apk" + automationAppApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-local-BrokerHostr-debug.apk" + automationAppTestApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-local-BrokerHost-debug-androidTest.apk" testTargetPackages: ${{ parameters.testTargetPackages }} resultsHistoryName: "Prod MSAL with Dev Broker (BrokerHost)" otherFiles: "/data/local/tmp/BrokerHost.apk=$(Pipeline.Workspace)/brokerHost/$(brokerHostApk),\ From bceef5716e94b2a59bc2a87ffd4fb917d1819707 Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Mon, 31 Oct 2022 13:53:50 +0300 Subject: [PATCH 06/18] fix spelling --- .../ui-automation/msal-brokerProd-to-DevBroker-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index d494cba9a..fba2f0bb5 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -135,7 +135,7 @@ stages: jobs: - template: ./templates/flank/run-on-firebase-with-flank.yml parameters: - automationAppApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-local-BrokerHostr-debug.apk" + automationAppApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-local-BrokerHost-debug.apk" automationAppTestApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-local-BrokerHost-debug-androidTest.apk" testTargetPackages: ${{ parameters.testTargetPackages }} resultsHistoryName: "Prod MSAL with Dev Broker (BrokerHost)" From f68cb2c86242d07fa50758ebc0a9bfe8e4ccdd10 Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Wed, 16 Nov 2022 19:29:11 +0300 Subject: [PATCH 07/18] use dist version --- .../ui-automation/msal-brokerProd-to-DevBroker-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index fba2f0bb5..155991115 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -73,7 +73,7 @@ stages: - template: ./templates/build-msal-automation-app.yml parameters: brokerFlavor: BrokerHost - msalFlavor: Local + msalFlavor: Dist brokerSource: LocalApk msalVersion: ${{ parameters.msalVersion }} # Brokers From 4f59417d9799ac80d4bae4e381c08fb6850666b4 Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Wed, 16 Nov 2022 19:33:50 +0300 Subject: [PATCH 08/18] use AutoBroker fllavor --- .../ui-automation/msal-brokerProd-to-DevBroker-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index 155991115..393b967ea 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -72,7 +72,7 @@ stages: jobs: - template: ./templates/build-msal-automation-app.yml parameters: - brokerFlavor: BrokerHost + brokerFlavor: AutoBroker msalFlavor: Dist brokerSource: LocalApk msalVersion: ${{ parameters.msalVersion }} From cf3e6fd58fe8013be77ab5f88202141982a406c8 Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Wed, 16 Nov 2022 19:42:18 +0300 Subject: [PATCH 09/18] change automation app file name --- .../ui-automation/msal-brokerProd-to-DevBroker-nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index 393b967ea..a64f005dc 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -135,8 +135,8 @@ stages: jobs: - template: ./templates/flank/run-on-firebase-with-flank.yml parameters: - automationAppApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-local-BrokerHost-debug.apk" - automationAppTestApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-local-BrokerHost-debug-androidTest.apk" + automationAppApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-dist-AutoBroker-debug.apk" + automationAppTestApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-dist-AutoBroker-debug-androidTest.apk" testTargetPackages: ${{ parameters.testTargetPackages }} resultsHistoryName: "Prod MSAL with Dev Broker (BrokerHost)" otherFiles: "/data/local/tmp/BrokerHost.apk=$(Pipeline.Workspace)/brokerHost/$(brokerHostApk),\ From 6069c9f30cbf4626b8030beaf363dcded8ba8996 Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Fri, 18 Nov 2022 01:43:54 +0300 Subject: [PATCH 10/18] add CP + Authenticator for AutoBroker config --- .../msal-brokerProd-to-DevBroker-nightly.yml | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index a64f005dc..cb7d41d86 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -53,6 +53,14 @@ parameters: - name: msalVersion displayName: MSAL Version type: string + - name: companyPortalVersion + displayName: Company Portal Version + type: string + default: '*' + - name: authenticatorVersion + displayName: Authenticator Version + type: string + default: '*' variables: engineeringProjectId: 'fac9d424-53d2-45c0-91b5-ef6ba7a6bf26' @@ -116,7 +124,29 @@ stages: feedDownloadExternal: '$(msazureFeedName)' packageDownloadExternal: 'broker-host' versionDownloadExternal: '${{ parameters.oldBrokerHostVersion }}' - + - task: UniversalPackages@0 + displayName: 'Download com.microsoft.windowsintune.companyportal-signed' + inputs: + command: 'download' + downloadDirectory: '$(Build.ArtifactStagingDirectory)/brokers' + feedsToUse: 'external' + externalFeedCredentials: '$(msazureServiceConnection)' + feedDownloadExternal: '$(msazureFeedName)' + packageDownloadExternal: 'com.microsoft.windowsintune.companyportal-signed' + versionDownloadExternal: '${{ parameters.companyPortalVersion }}' + - task: UniversalPackages@0 + displayName: 'Download com.azure.authenticator' + inputs: + command: 'download' + downloadDirectory: '$(Build.ArtifactStagingDirectory)/brokers' + feedsToUse: 'external' + externalFeedCredentials: '$(msazureServiceConnection)' + feedDownloadExternal: '$(msazureFeedName)' + packageDownloadExternal: 'com.azure.authenticator' + versionDownloadExternal: '${{ parameters.authenticatorVersion }}' + - publish: $(Build.ArtifactStagingDirectory)/brokers + displayName: 'Publish Authenticator/Company Portal Broker apks for later use' + artifact: brokerapks - publish: $(Build.ArtifactStagingDirectory)/azureSample displayName: 'Publish Azure Sample apk for later use' artifact: azureSample @@ -141,6 +171,8 @@ stages: resultsHistoryName: "Prod MSAL with Dev Broker (BrokerHost)" otherFiles: "/data/local/tmp/BrokerHost.apk=$(Pipeline.Workspace)/brokerHost/$(brokerHostApk),\ /data/local/tmp/OldBrokerHost.apk=$(Pipeline.Workspace)/oldBrokerHost/$(oldBrokerHostApk),\ + /data/local/tmp/CompanyPortal.apk=$(Pipeline.Workspace)/brokerapks/$(companyPortalApk),\ + /data/local/tmp/Authenticator.apk=$(Pipeline.Workspace)/brokerapks/$(authenticatorApk),\ /data/local/tmp/AzureSample.apk=$(Pipeline.Workspace)/azureSample/$(azureSampleApk)" resultsDir: "msal-BrokerHost-$(Build.BuildId)-$(Build.BuildNumber)" firebaseDeviceId: ${{ parameters.firebaseDeviceId }} From d7dfefb924a7328aab7df2703e3928d3d96924e0 Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Fri, 18 Nov 2022 02:16:14 +0300 Subject: [PATCH 11/18] add cp and authenticator variables --- .../ui-automation/msal-brokerProd-to-DevBroker-nightly.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index cb7d41d86..fc38e8912 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -71,6 +71,8 @@ variables: azureSampleApk: AzureSample-local-debug.apk brokerHostApk: brokerHost-local-debug.apk oldBrokerHostApk: brokerHost-local-debug.apk + companyPortalApk: com.microsoft.windowsintune.companyportal-signed.apk + authenticatorApk: app-production-universal-release-signed.apk firebaseTimeout: 45m stages: @@ -169,7 +171,8 @@ stages: automationAppTestApkPath: "$(Pipeline.Workspace)/msalautomationapks/msalautomationapp-dist-AutoBroker-debug-androidTest.apk" testTargetPackages: ${{ parameters.testTargetPackages }} resultsHistoryName: "Prod MSAL with Dev Broker (BrokerHost)" - otherFiles: "/data/local/tmp/BrokerHost.apk=$(Pipeline.Workspace)/brokerHost/$(brokerHostApk),\ + otherFiles: + "/data/local/tmp/BrokerHost.apk=$(Pipeline.Workspace)/brokerHost/$(brokerHostApk),\ /data/local/tmp/OldBrokerHost.apk=$(Pipeline.Workspace)/oldBrokerHost/$(oldBrokerHostApk),\ /data/local/tmp/CompanyPortal.apk=$(Pipeline.Workspace)/brokerapks/$(companyPortalApk),\ /data/local/tmp/Authenticator.apk=$(Pipeline.Workspace)/brokerapks/$(authenticatorApk),\ From 8f91e6f1b5d5781288f2350fe5b508d8a9adfd0e Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Fri, 18 Nov 2022 03:57:08 +0300 Subject: [PATCH 12/18] add old authenticator apk --- .../msal-brokerProd-to-DevBroker-nightly.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index fc38e8912..6a5958a6a 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -52,7 +52,7 @@ parameters: default: '0.0.1' - name: msalVersion displayName: MSAL Version - type: string + type: string - name: companyPortalVersion displayName: Company Portal Version type: string @@ -60,7 +60,7 @@ parameters: - name: authenticatorVersion displayName: Authenticator Version type: string - default: '*' + default: '*' variables: engineeringProjectId: 'fac9d424-53d2-45c0-91b5-ef6ba7a6bf26' @@ -73,6 +73,7 @@ variables: oldBrokerHostApk: brokerHost-local-debug.apk companyPortalApk: com.microsoft.windowsintune.companyportal-signed.apk authenticatorApk: app-production-universal-release-signed.apk + oldAuthenticatorApk: Authenticator-4.1.0-RC.apk firebaseTimeout: 45m stages: @@ -146,6 +147,16 @@ stages: feedDownloadExternal: '$(msazureFeedName)' packageDownloadExternal: 'com.azure.authenticator' versionDownloadExternal: '${{ parameters.authenticatorVersion }}' + - task: UniversalPackages@0 + displayName: 'Download old brokerHost version from feed' + inputs: + command: 'download' + downloadDirectory: '$(Build.ArtifactStagingDirectory)/brokers/oldAPKs' + feedsToUse: 'external' + externalFeedCredentials: '${{ parameters.msazureServiceConnection }}' + feedDownloadExternal: '${{ parameters.msazureFeedName }}' + packageDownloadExternal: 'broker-host' + versionDownloadExternal: '${{ parameters.oldBrokerHostVersion }}' - publish: $(Build.ArtifactStagingDirectory)/brokers displayName: 'Publish Authenticator/Company Portal Broker apks for later use' artifact: brokerapks @@ -176,6 +187,7 @@ stages: /data/local/tmp/OldBrokerHost.apk=$(Pipeline.Workspace)/oldBrokerHost/$(oldBrokerHostApk),\ /data/local/tmp/CompanyPortal.apk=$(Pipeline.Workspace)/brokerapks/$(companyPortalApk),\ /data/local/tmp/Authenticator.apk=$(Pipeline.Workspace)/brokerapks/$(authenticatorApk),\ + /data/local/tmp/OldAuthenticator.apk=$(Pipeline.WorkSpace)/brokerapks/oldAPKs/$(oldAuthenticatorApk),\ /data/local/tmp/AzureSample.apk=$(Pipeline.Workspace)/azureSample/$(azureSampleApk)" resultsDir: "msal-BrokerHost-$(Build.BuildId)-$(Build.BuildNumber)" firebaseDeviceId: ${{ parameters.firebaseDeviceId }} From 29dabafbac98d278383e4893692da7fab2e0ec00 Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Fri, 18 Nov 2022 04:02:07 +0300 Subject: [PATCH 13/18] add old authenticator version --- .../msal-brokerProd-to-DevBroker-nightly.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index 6a5958a6a..5b31abc7f 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -61,6 +61,10 @@ parameters: displayName: Authenticator Version type: string default: '*' + - name: oldAuthenticatorVersion + displayName: Old Authenticator Version + type: string + default: '6.2204.2470' variables: engineeringProjectId: 'fac9d424-53d2-45c0-91b5-ef6ba7a6bf26' @@ -148,7 +152,7 @@ stages: packageDownloadExternal: 'com.azure.authenticator' versionDownloadExternal: '${{ parameters.authenticatorVersion }}' - task: UniversalPackages@0 - displayName: 'Download old brokerHost version from feed' + displayName: 'Download old Authenticator version from feed' inputs: command: 'download' downloadDirectory: '$(Build.ArtifactStagingDirectory)/brokers/oldAPKs' @@ -156,7 +160,7 @@ stages: externalFeedCredentials: '${{ parameters.msazureServiceConnection }}' feedDownloadExternal: '${{ parameters.msazureFeedName }}' packageDownloadExternal: 'broker-host' - versionDownloadExternal: '${{ parameters.oldBrokerHostVersion }}' + versionDownloadExternal: '${{ parameters.oldAuthenticatorVersion }}' - publish: $(Build.ArtifactStagingDirectory)/brokers displayName: 'Publish Authenticator/Company Portal Broker apks for later use' artifact: brokerapks From 8239232111edb93048149396438e2d0c2c96527d Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Fri, 18 Nov 2022 04:03:14 +0300 Subject: [PATCH 14/18] fix external feed credentials --- .../ui-automation/msal-brokerProd-to-DevBroker-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index 5b31abc7f..22ea97275 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -157,7 +157,7 @@ stages: command: 'download' downloadDirectory: '$(Build.ArtifactStagingDirectory)/brokers/oldAPKs' feedsToUse: 'external' - externalFeedCredentials: '${{ parameters.msazureServiceConnection }}' + externalFeedCredentials: '${{msazureServiceConnection }}' feedDownloadExternal: '${{ parameters.msazureFeedName }}' packageDownloadExternal: 'broker-host' versionDownloadExternal: '${{ parameters.oldAuthenticatorVersion }}' From 467255fab1c2ea68e42f4272164450400e15e46e Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Fri, 18 Nov 2022 04:04:29 +0300 Subject: [PATCH 15/18] fix feed download external --- .../ui-automation/msal-brokerProd-to-DevBroker-nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index 22ea97275..c39e5a800 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -157,8 +157,8 @@ stages: command: 'download' downloadDirectory: '$(Build.ArtifactStagingDirectory)/brokers/oldAPKs' feedsToUse: 'external' - externalFeedCredentials: '${{msazureServiceConnection }}' - feedDownloadExternal: '${{ parameters.msazureFeedName }}' + externalFeedCredentials: '$(msazureServiceConnection)' + feedDownloadExternal: '$(msazureFeedName)' packageDownloadExternal: 'broker-host' versionDownloadExternal: '${{ parameters.oldAuthenticatorVersion }}' - publish: $(Build.ArtifactStagingDirectory)/brokers From c8b738c30e78707d290141946b08bba5fdf5f3ab Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Fri, 18 Nov 2022 04:11:31 +0300 Subject: [PATCH 16/18] update old authenticator download task --- .../msal-brokerProd-to-DevBroker-nightly.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index c39e5a800..3c08831c2 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -152,15 +152,14 @@ stages: packageDownloadExternal: 'com.azure.authenticator' versionDownloadExternal: '${{ parameters.authenticatorVersion }}' - task: UniversalPackages@0 - displayName: 'Download old Authenticator version from feed' + displayName: 'Download old authenticator (Pre v5 Broker) version from feed' inputs: command: 'download' downloadDirectory: '$(Build.ArtifactStagingDirectory)/brokers/oldAPKs' - feedsToUse: 'external' - externalFeedCredentials: '$(msazureServiceConnection)' - feedDownloadExternal: '$(msazureFeedName)' - packageDownloadExternal: 'broker-host' - versionDownloadExternal: '${{ parameters.oldAuthenticatorVersion }}' + feedsToUse: 'internal' + vstsFeed: '${{ parameters.internalFeedName }}' + vstsFeedPackage: 'com.azure.authenticator' + vstsPackageVersion: '${{ parameters.oldAuthenticatorVersion }}' - publish: $(Build.ArtifactStagingDirectory)/brokers displayName: 'Publish Authenticator/Company Portal Broker apks for later use' artifact: brokerapks From 7b0a59594f546b0b14054689fca49cf3f4143645 Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Fri, 18 Nov 2022 04:12:17 +0300 Subject: [PATCH 17/18] add internal feed name --- .../ui-automation/msal-brokerProd-to-DevBroker-nightly.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index 3c08831c2..d6a531160 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -65,6 +65,9 @@ parameters: displayName: Old Authenticator Version type: string default: '6.2204.2470' + - name: internalFeedName + type: string + default: 'AndroidAdal' variables: engineeringProjectId: 'fac9d424-53d2-45c0-91b5-ef6ba7a6bf26' From d6ef1755ff1dd583d629d6132816979746223cfe Mon Sep 17 00:00:00 2001 From: Samuel Wainaina Date: Fri, 18 Nov 2022 05:06:16 +0300 Subject: [PATCH 18/18] add new line --- .../ui-automation/msal-brokerProd-to-DevBroker-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml index d6a531160..7ab3f1cb3 100644 --- a/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml +++ b/azure-pipelines/ui-automation/msal-brokerProd-to-DevBroker-nightly.yml @@ -198,4 +198,4 @@ stages: resultsDir: "msal-BrokerHost-$(Build.BuildId)-$(Build.BuildNumber)" firebaseDeviceId: ${{ parameters.firebaseDeviceId }} firebaseDeviceAndroidVersion: ${{ parameters.firebaseDeviceAndroidVersion }} -... \ No newline at end of file +...