Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/skills/release-helper/references/file-map.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
21 changes: 0 additions & 21 deletions azure-pipelines/templates/buildProduct/build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
103 changes: 0 additions & 103 deletions azure-pipelines/test-app/java-linux-test-app.yml

This file was deleted.

2 changes: 1 addition & 1 deletion docs/AzureDevOps/Compliance/OSSReviews.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
9 changes: 0 additions & 9 deletions java-complete/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
9 changes: 0 additions & 9 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
Loading