From 2e08641de9e3b216aa0f71f581b44a7bd73a4d4b Mon Sep 17 00:00:00 2001 From: fadidurah Date: Thu, 20 Aug 2026 15:03:04 -0400 Subject: [PATCH] Remove retired Linux broker wiring Remove stale Gradle module registrations and legacy pipeline paths after retiring the Linux broker from ad-accounts-for-android. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 1b089bb0-80e0-4b26-a1e9-398f0644f4ff --- .../release-helper/references/file-map.md | 1 - .../auth-client-android-dev.yml | 27 +---- .../flighted-auth-client-android-dev.yml | 61 +---------- .../buildProduct/build-and-publish.yml | 21 ---- .../test-app/java-linux-test-app.yml | 103 ------------------ docs/AzureDevOps/Compliance/OSSReviews.md | 2 +- java-complete/settings.gradle | 9 -- settings.gradle | 9 -- 8 files changed, 3 insertions(+), 230 deletions(-) delete mode 100644 azure-pipelines/test-app/java-linux-test-app.yml diff --git a/.github/skills/release-helper/references/file-map.md b/.github/skills/release-helper/references/file-map.md index b34cb542..358f1dc3 100644 --- a/.github/skills/release-helper/references/file-map.md +++ b/.github/skills/release-helper/references/file-map.md @@ -189,7 +189,6 @@ azure-pipelines/ │ ├── adal-test-app.yml # ADAL test app CD (cron 3AM UTC) │ ├── azure-sample-app.yml # Azure sample app CD │ ├── broker-host.yml # Broker host app CD -│ ├── java-linux-test-app.yml # Java Linux test app CD │ ├── microsoft-identity-diagnostics-cd.yml │ └── msal-test-app.yml # MSAL test app CD ├── ui-automation/ diff --git a/azure-pipelines/continuous-delivery/auth-client-android-dev.yml b/azure-pipelines/continuous-delivery/auth-client-android-dev.yml index 2de5ad20..4cddecbd 100644 --- a/azure-pipelines/continuous-delivery/auth-client-android-dev.yml +++ b/azure-pipelines/continuous-delivery/auth-client-android-dev.yml @@ -1,6 +1,6 @@ # File: azure-pipelines/continuous-delivery/auth-client-android-dev.yml # Description: Assemble & publish dev builds of auth client android sdk libraries to internal maven feed -# Libraries include common4j, common, broker4j, linux broker, broker, msal and adal +# Libraries include common4j, common, broker4j, broker, msal and adal # Variable: 'mvnUserName' user name to access internal maven feed # Variable: 'mvnAccessToken' access token to access internal maven feed # Variable: 'MSAL_LTW_Branch' MSAL branch to be passed to LTW UI Automation @@ -108,7 +108,6 @@ variables: common4jVersionParam: -PdistCommon4jVersion=$(versionNumber) broker4jVersionParam: -PdistBroker4jVersion=$(versionNumber) commonVersionParam: -PdistCommonVersion=$(versionNumber) - linuxBrokerVersion: -PlinuxBrokerVersion=$(versionNumber) androidProjectDependencyParam: --configuration=distReleaseRuntimeClasspath --write-locks javaProjectDependencyParam: --configuration=runtimeClasspath --write-locks authenticatorPipelineId: 358290 @@ -295,30 +294,6 @@ stages: vstsMvnAndroidAccessToken: ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN shouldRunUnitTests: ${{ parameters.shouldRunUnitTests }} publishLibraryArtifacts: ${{ parameters.publishLibraryArtifacts }} -# Linux Broker - Build and publish -- stage: 'publishLinuxBrokeLibraries' - displayName: Linux Broker - Build and publish - dependsOn: - - publishCommon4jLibraries - - publishBroke4jLibraries - - setupStage - variables: - flagVariable: $[ stageDependencies.setupStage.alternateSchedule.outputs['finalSetupScript.finalFlag'] ] - jobs: - - template: assemble&publish.yml - parameters: - repository: broker - project: LinuxBroker - publishCmd: publishAarPublicationToVsts-maven-adal-androidRepository - testCmd: linuxBrokerUnitTestCoverageReport - dependencyParams: $(broker4jVersionParam) $(common4jVersionParam) $(javaProjectDependencyParam) - assembleParams: $(projVersionParam) $(broker4jVersionParam) $(common4jVersionParam) $(flagVariable) - publishParams: $(projVersionParam) $(broker4jVersionParam) $(common4jVersionParam) $(flagVariable) - vstsMvnAndroidUsername: ENV_VSTS_MVN_ANDROIDADACCOUNTS_USERNAME - vstsMvnAndroidAccessToken: ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN - testParams: $(common4jVersionParam) $(broker4jVersionParam) -PcodeCoverageEnabled=true $(flagVariable) -Psystemd_mode_enabled=false --build-cache --info - shouldRunUnitTests: False - publishLibraryArtifacts: ${{ parameters.publishLibraryArtifacts }} # Msal - Build and publish - stage: 'publishMsal' displayName: Msal - Build and publish diff --git a/azure-pipelines/continuous-delivery/flighted-auth-client-android-dev.yml b/azure-pipelines/continuous-delivery/flighted-auth-client-android-dev.yml index dc844128..a97de71e 100644 --- a/azure-pipelines/continuous-delivery/flighted-auth-client-android-dev.yml +++ b/azure-pipelines/continuous-delivery/flighted-auth-client-android-dev.yml @@ -1,6 +1,6 @@ # File: azure-pipelines/continuous-delivery/auth-client-android-dev.yml # Description: Assemble & publish dev builds of auth client android sdk libraries to internal maven feed -# Libraries include common4j, common, broker4j, linux broker, broker, msal and adal +# Libraries include common4j, common, broker4j, broker, msal and adal # Variable: 'mvnUserName' user name to access internal maven feed # Variable: 'mvnPAT' access token to access internal maven feed # Variable: 'MSAL_LTW_Branch' MSAL branch to be passed to LTW UI Automation @@ -103,7 +103,6 @@ variables: common4jVersionParam: -PdistCommon4jVersion=$(versionNumber) broker4jVersionParam: -PdistBroker4jVersion=$(versionNumber) commonVersionParam: -PdistCommonVersion=$(versionNumber) - linuxBrokerVersion: -PlinuxBrokerVersion=$(versionNumber) androidProjectDependencyParam: --configuration=distReleaseRuntimeClasspath --write-locks javaProjectDependencyParam: --configuration=runtimeClasspath --write-locks authenticatorPipelineId: 237369 @@ -245,64 +244,6 @@ stages: shouldRunInstrumentedTests: ${{ parameters.shouldRunInstrumentedTests }} tokenSelection: 'mvnPAT' publishLibraryArtifacts: ${{ parameters.publishLibraryArtifacts }} -# Linux Broker - Build and publish -- stage: 'publishLinuxBrokeLibraries' - displayName: Linux Broker - Build and publish - dependsOn: - - publishCommon4jLibraries - - publishBroke4jLibraries - jobs: - - template: assemble&publish.yml - parameters: - repository: broker - project: LinuxBroker - publishCmd: publishAarPublicationToVsts-maven-adal-androidRepository - testCmd: linuxBrokerUnitTestCoverageReport - dependencyParams: $(broker4jVersionParam) $(common4jVersionParam) $(javaProjectDependencyParam) - assembleParams: $(projVersionParam) $(broker4jVersionParam) $(common4jVersionParam) - publishParams: $(projVersionParam) $(broker4jVersionParam) $(common4jVersionParam) - vstsMvnAndroidUsername: ENV_VSTS_MVN_ANDROIDADACCOUNTS_USERNAME - vstsMvnAndroidAccessToken: ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN - shouldPublish: ${{ parameters.shouldPublishLibraries }} - testParams: $(common4jVersionParam) $(broker4jVersionParam) -PcodeCoverageEnabled=true -PlabSecret=$(LabVaultAppSecret) -Psystemd_mode_enabled=false --build-cache --info - shouldRunUnitTests: ${{ parameters.shouldRunUnitTests }} - shouldRunInstrumentedTests: ${{ parameters.shouldRunInstrumentedTests }} - tokenSelection: 'mvnPAT' - publishLibraryArtifacts: ${{ parameters.publishLibraryArtifacts }} - - job: PublishLinuxBrokerPackage - dependsOn: publishLinuxBrokerLibraries - displayName: Publish Linux Broker Package - pool: - vmImage: ubuntu-latest - variables: - - group: AndroidAuthClientAutomationSecrets - steps: - - checkout: broker - persistCredentials: True - - task: Gradle@3 - displayName: Build and publish linux broker package - env: - ENV_VSTS_MVN_ANDROIDADACCOUNTS_USERNAME: VSTS - ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN: $(mvnPAT) - inputs: - cwd: $(Build.SourcesDirectory)/broker-java-root - tasks: LinuxBrokerPackage:clean LinuxBrokerPackage:buildDebian $(linuxBrokerVersion) --build-cache --info - publishJUnitResults: false - jdkArchitecture: x86 - sqAnalysisBreakBuildIfQualityGateFailed: false - - task: CopyFiles@2 - name: CopyFiles1 - displayName: Copy Files to Artifact Staging Directory - inputs: - SourceFolder: LinuxBrokerPackage/build/distributions - TargetFolder: $(build.artifactstagingdirectory) - - task: PublishPipelineArtifact@1 - name: PublishPipelineArtifacts1 - enabled: ${{ parameters.publishLibraryArtifacts }} - displayName: 'Publish Artifact: LinuxBrokerPackage Linux Test App Deb' - inputs: - ArtifactName: LinuxBrokerPackage Deb Package - TargetPath: $(build.artifactstagingdirectory) # Msal - Build and publish - stage: 'publishMsal' displayName: Msal - Build and publish diff --git a/azure-pipelines/templates/buildProduct/build-and-publish.yml b/azure-pipelines/templates/buildProduct/build-and-publish.yml index 3c3f182c..6627a31e 100644 --- a/azure-pipelines/templates/buildProduct/build-and-publish.yml +++ b/azure-pipelines/templates/buildProduct/build-and-publish.yml @@ -117,27 +117,6 @@ jobs: steps: - checkout: ${{ parameters.repository }} persistCredentials: True - - task: Bash@3 - condition: eq('${{ parameters.project }}', 'LinuxBroker') - retryCountOnTaskFailure: 3 - displayName: Linux Testing Setup - continueOnError: true - inputs: - workingDirectory: $(Build.SourcesDirectory)/broker-java-root - targetType: 'inline' - script: | - sudo apt-get install -y dbus-x11 - sudo apt-get install -y dos2unix - dos2unix gradlew - chmod +x gradlew - export DISPLAY=:0.0 - eval $(dbus-launch --sh-syntax) - sudo apt install gnome-keyring - /usr/bin/gnome-keyring-daemon --start --components=secrets - ./gradlew LinuxBroker:linuxBrokerUnitTestCoverageReport ${{ parameters.testParams}} - env: - ${{ parameters.vstsMvnAndroidUsername }}: VSTS - ${{ parameters.vstsMvnAndroidAccessToken }}: $(${{ parameters.tokenSelection }}) - task: Gradle@3 displayName: Run Test ${{ parameters.project }} continueOnError: true diff --git a/azure-pipelines/test-app/java-linux-test-app.yml b/azure-pipelines/test-app/java-linux-test-app.yml deleted file mode 100644 index e00f93d5..00000000 --- a/azure-pipelines/test-app/java-linux-test-app.yml +++ /dev/null @@ -1,103 +0,0 @@ -# File: azure-pipelines\test-app\java-linux-test-app.yml -# Description: Build Deb and Rpm and also publish the packages as pipeline artifact. -# Variable: 'ENV_VSTS_MVN_ANDROIDADACCOUNTS_USERNAME' was defined in the Variables tab -# https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate - -name: $(Build.BuildId)_$(Build.DefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r) - -trigger: none -pr: none - -schedules: - - cron: 0 3 * * * - branches: - include: - - master - always: true - -resources: - repositories: - - repository: broker - type: githubenterprise - name: security/ad-accounts-for-android - ref: dev - endpoint: MSFT_GHE_SECURITY - -jobs: -- job: build_deb - displayName: Build & Publish Deb for java-linux-test-app - cancelTimeoutInMinutes: 1 - pool: - vmImage: ubuntu-20.04 - variables: - - group: AndroidAuthClientAutomationSecrets - steps: - - checkout: broker - clean: true - submodules: recursive - persistCredentials: True - - task: CmdLine@1 - displayName: Set MVN Access Token in Environment - inputs: - filename: echo - arguments: '##vso[task.setvariable variable=ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN]$(System.AccessToken)' - - task: Gradle@1 - name: Gradle1 - displayName: Build Deb with Java Dependency - inputs: - cwd: $(Build.SourcesDirectory)/broker-java-root - tasks: java-linux-test-app:clean java-linux-test-app:buildDebian --build-cache --info - publishJUnitResults: false - jdkArchitecture: x86 - sqAnalysisBreakBuildIfQualityGateFailed: false - - task: CopyFiles@2 - name: CopyFiles1 - displayName: Copy Files to Artifact Staging Directory - inputs: - SourceFolder: java-linux-test-app/build/distributions - TargetFolder: $(build.artifactstagingdirectory) - - task: PublishPipelineArtifact@1 - name: PublishPipelineArtifacts1 - displayName: 'Publish Artifact: Linux Test App Deb' - inputs: - ArtifactName: java-linux-test-app Deb Package - TargetPath: $(build.artifactstagingdirectory) -- job: build_rpm - displayName: Build & Publish Rpm for java-linux-test-app - cancelTimeoutInMinutes: 1 - pool: - vmImage: ubuntu-20.04 - variables: - - group: AndroidAuthClientAutomationSecrets - steps: - - checkout: broker - clean: true - submodules: recursive - persistCredentials: True - - task: CmdLine@1 - displayName: Set MVN Access Token in Environment - inputs: - filename: echo - arguments: '##vso[task.setvariable variable=ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN]$(System.AccessToken)' - - task: Gradle@1 - name: Gradle1 - displayName: Build Rpm with Java Dependency - inputs: - cwd: $(Build.SourcesDirectory)/broker-java-root - tasks: java-linux-test-app:clean java-linux-test-app:buildRpmtestapp --build-cache --info - publishJUnitResults: false - jdkArchitecture: x64 - jdkVersionOption: "1.11" - - task: CopyFiles@2 - name: CopyFiles1 - displayName: Copy Files to Artifact Staging Directory - inputs: - SourceFolder: java-linux-test-app/build/distributions - TargetFolder: $(build.artifactstagingdirectory) - - task: PublishPipelineArtifact@1 - name: PublishPipelineArtifacts1 - displayName: 'Publish Artifact: Linux Test App Rpm' - inputs: - ArtifactName: java-linux-test-app Rpm Package - TargetPath: $(build.artifactstagingdirectory) -... diff --git a/docs/AzureDevOps/Compliance/OSSReviews.md b/docs/AzureDevOps/Compliance/OSSReviews.md index c42718d0..5c1cb701 100644 --- a/docs/AzureDevOps/Compliance/OSSReviews.md +++ b/docs/AzureDevOps/Compliance/OSSReviews.md @@ -45,4 +45,4 @@ Android Identity governed repositories are found in the [Engineering project](ht - azuread/microsoft-authentication-library-common-for-android - azuread/microsoft-authentication-library-for-android -The [azuread/android-complete repository](https://identitydivision.visualstudio.com/Engineering/_componentGovernance/181889?_a=alerts&typeId=9846578&alerts-view-option=active) is the only repository we maintain that keeps track of the approval status of OSS components and has an up-to-date list of the consumed components for all our projects (msal, adal, common, common4j, broker, broker4j, and Linux broker). +The [azuread/android-complete repository](https://identitydivision.visualstudio.com/Engineering/_componentGovernance/181889?_a=alerts&typeId=9846578&alerts-view-option=active) is the only repository we maintain that keeps track of the approval status of OSS components and has an up-to-date list of the consumed components for all our projects (msal, adal, common, common4j, broker, and broker4j). diff --git a/java-complete/settings.gradle b/java-complete/settings.gradle index 603fdf6d..75b63566 100644 --- a/java-complete/settings.gradle +++ b/java-complete/settings.gradle @@ -43,14 +43,5 @@ project(':AcaPlugin').projectDir = new File('../plugins/buildsystem') include(":broker4j") project(':broker4j').projectDir = new File('../broker/broker4j') -include(":LinuxBroker") -project(':LinuxBroker').projectDir = new File('../broker/LinuxBroker') - -include(":LinuxBrokerPackage") -project(':LinuxBrokerPackage').projectDir = new File('../broker/LinuxBrokerPackage') - -include(':java-linux-test-app') -project(':java-linux-test-app').projectDir = new File('../broker/java-linux-test-app') - include(':LabApiUtilities') project(':LabApiUtilities').projectDir = new File('../common/LabApiUtilities') diff --git a/settings.gradle b/settings.gradle index 97a748c6..bae6faf8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -192,18 +192,9 @@ project(':AcaPlugin').projectDir = new File('plugins/buildsystem') include(":broker4j") project(':broker4j').projectDir = new File('broker/broker4j') -include(":LinuxBroker") -project(':LinuxBroker').projectDir = new File('broker/LinuxBroker') - include(':LabApiUtilities') project(':LabApiUtilities').projectDir = new File('common/LabApiUtilities') -include(':java-linux-test-app') -project(':java-linux-test-app').projectDir = new File('broker/java-linux-test-app') - -include(":LinuxBrokerPackage") -project(':LinuxBrokerPackage').projectDir = new File('/broker/LinuxBrokerPackage') - include(":AzureSample") project(':AzureSample').projectDir = new File('azuresample/app')