From 7be6e44b77abba929833d702dc99b61aa4307de3 Mon Sep 17 00:00:00 2001 From: Muyao Feng Date: Tue, 10 May 2022 14:28:05 +0800 Subject: [PATCH 1/8] add pipeline --- sdk/spring/compatibility-test.yml | 143 +++++++++++++++++++ sdk/spring/compatibility.yml | 227 ++++++++++++++++++++++++++++++ 2 files changed, 370 insertions(+) create mode 100644 sdk/spring/compatibility-test.yml create mode 100644 sdk/spring/compatibility.yml diff --git a/sdk/spring/compatibility-test.yml b/sdk/spring/compatibility-test.yml new file mode 100644 index 000000000000..37f58be1a26d --- /dev/null +++ b/sdk/spring/compatibility-test.yml @@ -0,0 +1,143 @@ +parameters: + - name: Artifacts + type: object + default: [] + - name: TestPipeline + type: boolean + default: false + - name: AdditionalModules + type: object + default: [] + - name: SDKType + type: string + default: client + - name: ServiceDirectory + type: string + default: spring + - name: MatrixConfigs + type: object + default: + - Name: Java_ci_test_base + Path: eng/pipelines/templates/stages/platform-matrix.json + Selection: sparse + NonSparseParameters: Agent + GenerateVMJobs: true + - name: AdditionalMatrixConfigs + type: object + default: [] + - name: MatrixFilters + type: object + default: [] + - name: MatrixReplace + type: object + default: [] + - name: SkipAggregateReports + type: boolean + default: false + - name: PreBuildSteps + type: object + default: [] + - name: SpringBootVersion + type: string + default: 'not-specified' # Set a default that breaks in obvious ways. + - name: SpringCloudVersion + type: string + default: 'not-specified' # Set a default that breaks in obvious ways. + - name: AdditionalBuildOptions + type: string + default: '' + - name: BuildParallelization + type: string + default: '2C' + - name: TestParallelization + type: string + default: '1C' + - name: ParallelTestPlayback + type: string + default: 'false' + - name: TestOptions + type: string + default: '' + - name: TestGoals + type: string + default: $(TestGoals) + - name: TestEnvVars + type: object + default: {} + +stages: + - stage: 'Compatibility Check' + jobs: + - job: 'Test ubuntu2004_111' + variables: + - template: ../../eng/pipelines/templates/variables/globals.yml + pool: + name: azsdk-pool-mms-ubuntu-2004-general + vmImage: MMSUbuntu20.04 + steps: + - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml + parameters: + Paths: + - 'sdk/${{ parameters.ServiceDirectory }}' + - '**/*.xml' + - '**/*.md' + - '.vscode/cspell.json' + - '!sdk/**/test-recordings' + - '!sdk/**/session-records' + - template: ../../eng/pipelines/templates/steps/generate-project-list.yml + parameters: + Artifacts: ${{ parameters.Artifacts }} + AdditionalModules: ${{ parameters.AdditionalModules }} + JobType: 'Test ubuntu2004_111' + SDKType: ${{parameters.SDKType}} + ServiceDirectory: ${{parameters.ServiceDirectory}} + - task: PythonScript@0 + displayName: 'Generate directories variable for sparse checkout' + inputs: + scriptPath: 'eng/scripts/generate_from_source_pom.py' + arguments: '--set-pipeline-variable CheckoutDirectories --project-list $(ProjectList)' + workingDirectory: '$(System.DefaultWorkingDirectory)' + - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml + parameters: + Paths: $(CheckoutDirectories) + SkipDefaultCheckout: true + - template: ../../eng/pipelines/templates/steps/install-reporting-tools.yml + - task: Maven@3 + displayName: 'Build for From Source run' + inputs: + mavenPomFile: ClientFromSourcePom.xml + goals: 'install' + # Build and install every track 2, client, library. The purpose is to have all the libraries installed on the + # machine, so we can simply run tests with the -amd switch and we can remove the SNAFU of dependencies that + # bloated the ci.yml files' AdditionalModules because we ended up having to list every transitive azure client + # dependency. Note: The -T 1C says spin up a build thread per core. Since we're building + # all the track 2, client, libraries (which is now over 100) this effectively cuts the build time in half. + options: $(DefaultOptions) -DskipTests $(DefaultSkipOptions) -Djacoco.skip=true -T ${{ parameters.BuildParallelization }} ${{ parameters.AdditionalBuildOptions }} + mavenOptions: '$(MemoryOptions) $(LoggingOptions)' + javaHomeOption: 'JDKVersion' + jdkVersionOption: $(JavaTestVersion) + jdkArchitectureOption: 'x64' + publishJUnitResults: false + condition: and(succeeded(), eq(variables['TestFromSource'], 'true')) + - task: Maven@3 + displayName: 'Run tests for From Source run' + inputs: + mavenPomFile: ClientFromSourcePom.xml + # For the "From Source" runs we don't want the -am switch as we don't care about running tests for our + # dependencies, but we do want the -amd switch because we want to run tests on things that depend on us. + ${{ if eq(parameters.IsLiveTest, 'true') }}: + options: $(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -T ${{ parameters.TestParallelization }} + ${{ else }}: + options: $(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -amd -T ${{ parameters.TestParallelization }} + mavenOptions: '$(MemoryOptions) $(LoggingOptions)' + javaHomeOption: 'JDKVersion' + jdkVersionOption: $(JavaTestVersion) + jdkArchitectureOption: 'x64' + publishJUnitResults: false + # The "From Source" runs only care about running tests for libraries within an SDK/area + # as well as libraries which depend on them and not the other stages in the Maven + # lifecycle that test or verify targets would execute. The libraries were already + # compiled and installed in the previous task, this tasks only runs tests. + goals: ${{ parameters.TestGoals }} + env: ${{ parameters.TestEnvVars }} + condition: and(succeeded(), eq(variables['TestFromSource'], 'true')) \ No newline at end of file diff --git a/sdk/spring/compatibility.yml b/sdk/spring/compatibility.yml new file mode 100644 index 000000000000..8e7faa895b80 --- /dev/null +++ b/sdk/spring/compatibility.yml @@ -0,0 +1,227 @@ +trigger: none +pr: none + +parameters: + - name: Artifacts + type: object + default: + - name: spring-cloud-azure-core + groupId: com.azure.spring + safeName: springcloudazurecore + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-cloud-azure-service + groupId: com.azure.spring + safeName: springcloudazureservice + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-cloud-azure-resourcemanager + groupId: com.azure.spring + safeName: springcloudazureresourcemanager + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-cloud-azure-trace-sleuth + groupId: com.azure.spring + safeName: springcloudazuretracesleuth + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-messaging-azure + groupId: com.azure.spring + safeName: springmessagingazure + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-messaging-azure-eventhubs + groupId: com.azure.spring + safeName: springmessagingazureeventhubs + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-messaging-azure-servicebus + groupId: com.azure.spring + safeName: springmessagingazureservicebus + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-messaging-azure-storage-queue + groupId: com.azure.spring + safeName: springmessagingazurestoragequeue + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-integration-azure-core + groupId: com.azure.spring + safeName: springintegrationazurecore + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-integration-azure-eventhubs + groupId: com.azure.spring + safeName: springintegrationazureeventhubs + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-integration-azure-servicebus + groupId: com.azure.spring + safeName: springintegrationazureservicebus + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-integration-azure-storage-queue + groupId: com.azure.spring + safeName: springintegrationazurestoragequeue + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-cloud-azure-autoconfigure + groupId: com.azure.spring + safeName: springcloudazureautoconfigure + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-cloud-azure-actuator + groupId: com.azure.spring + safeName: springcloudazureactuator + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-cloud-azure-actuator-autoconfigure + groupId: com.azure.spring + safeName: springcloudazureactuatorautoconfigure + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter + groupId: com.azure.spring + safeName: springcloudazurestarter + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-actuator + groupId: com.azure.spring + safeName: springcloudazurestarteractuator + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-appconfiguration + groupId: com.azure.spring + safeName: springcloudazurestarterappconfiguration + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-cosmos + groupId: com.azure.spring + safeName: springcloudazurestartercosmos + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-data-cosmos + groupId: com.azure.spring + safeName: springcloudazurestarterdatacosmos + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-eventhubs + groupId: com.azure.spring + safeName: springcloudazurestartereventhubs + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-keyvault-certificates + groupId: com.azure.spring + safeName: springcloudazurestarterkeyvaultcertificates + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-keyvault-secrets + groupId: com.azure.spring + safeName: springcloudazurestarterkeyvaultsecrets + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-servicebus + groupId: com.azure.spring + safeName: springcloudazurestarterservicebus + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-servicebus-jms + groupId: com.azure.spring + safeName: springcloudazurestarterservicebusjms + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-storage-blob + groupId: com.azure.spring + safeName: springcloudazurestarterstorageblob + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-storage-file-share + groupId: com.azure.spring + safeName: springcloudazurestarterstoragefileshare + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-storage-queue + groupId: com.azure.spring + safeName: springcloudazurestarterstoragequeue + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-integration-eventhubs + groupId: com.azure.spring + safeName: springcloudazurestarterintegrationeventhubs + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-integration-servicebus + groupId: com.azure.spring + safeName: springcloudazurestarterintegrationservicebus + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-integration-storage-queue + groupId: com.azure.spring + safeName: springcloudazurestarterintegrationstoragequeue + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-stream-binder-servicebus-core + groupId: com.azure.spring + safeName: springcloudazurestreambinderservicebuscore + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-cloud-azure-stream-binder-servicebus + groupId: com.azure.spring + safeName: springcloudazurestreambinderservicebus + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-cloud-azure-stream-binder-eventhubs + groupId: com.azure.spring + safeName: springcloudazurestreambindereventhubs + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-cloud-azure-stream-binder-eventhubs-core + groupId: com.azure.spring + safeName: springcloudazurestreambindereventhubscore + skipPublishDocMs: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-stream-eventhubs + groupId: com.azure.spring + safeName: springcloudazurestarterstreameventhubs + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-stream-servicebus + groupId: com.azure.spring + safeName: springcloudazurestarterstreamservicebus + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-active-directory + groupId: com.azure.spring + safeName: springcloudazurestarteractivedirectory + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + - name: spring-cloud-azure-starter-active-directory-b2c + groupId: com.azure.spring + safeName: springcloudazurestarteractivedirectoryb2c + skipPublishDocMs: true + skipUpdatePackageJson: true + skipVerifyChangelog: true + +stages: + - template: ../../../../sdk/spring/compatibility-test.yml + parameters: + Artifacts: ${{ parameters.Artifacts }} \ No newline at end of file From d040a2ad2a26e0e733640f718cce870e4a145fa7 Mon Sep 17 00:00:00 2001 From: Muyao Feng Date: Tue, 10 May 2022 15:17:53 +0800 Subject: [PATCH 2/8] add pipeline --- sdk/spring/compatibility-test.yml | 159 +++------------------ sdk/spring/compatibility.yml | 227 ------------------------------ 2 files changed, 17 insertions(+), 369 deletions(-) delete mode 100644 sdk/spring/compatibility.yml diff --git a/sdk/spring/compatibility-test.yml b/sdk/spring/compatibility-test.yml index 37f58be1a26d..c008feadd491 100644 --- a/sdk/spring/compatibility-test.yml +++ b/sdk/spring/compatibility-test.yml @@ -1,143 +1,18 @@ -parameters: - - name: Artifacts - type: object - default: [] - - name: TestPipeline - type: boolean - default: false - - name: AdditionalModules - type: object - default: [] - - name: SDKType - type: string - default: client - - name: ServiceDirectory - type: string - default: spring - - name: MatrixConfigs - type: object - default: - - Name: Java_ci_test_base - Path: eng/pipelines/templates/stages/platform-matrix.json - Selection: sparse - NonSparseParameters: Agent - GenerateVMJobs: true - - name: AdditionalMatrixConfigs - type: object - default: [] - - name: MatrixFilters - type: object - default: [] - - name: MatrixReplace - type: object - default: [] - - name: SkipAggregateReports - type: boolean - default: false - - name: PreBuildSteps - type: object - default: [] - - name: SpringBootVersion - type: string - default: 'not-specified' # Set a default that breaks in obvious ways. - - name: SpringCloudVersion - type: string - default: 'not-specified' # Set a default that breaks in obvious ways. - - name: AdditionalBuildOptions - type: string - default: '' - - name: BuildParallelization - type: string - default: '2C' - - name: TestParallelization - type: string - default: '1C' - - name: ParallelTestPlayback - type: string - default: 'false' - - name: TestOptions - type: string - default: '' - - name: TestGoals - type: string - default: $(TestGoals) - - name: TestEnvVars - type: object - default: {} +trigger: none +pr: none -stages: - - stage: 'Compatibility Check' - jobs: - - job: 'Test ubuntu2004_111' - variables: - - template: ../../eng/pipelines/templates/variables/globals.yml - pool: - name: azsdk-pool-mms-ubuntu-2004-general - vmImage: MMSUbuntu20.04 - steps: - - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml - parameters: - Paths: - - 'sdk/${{ parameters.ServiceDirectory }}' - - '**/*.xml' - - '**/*.md' - - '.vscode/cspell.json' - - '!sdk/**/test-recordings' - - '!sdk/**/session-records' - - template: ../../eng/pipelines/templates/steps/generate-project-list.yml - parameters: - Artifacts: ${{ parameters.Artifacts }} - AdditionalModules: ${{ parameters.AdditionalModules }} - JobType: 'Test ubuntu2004_111' - SDKType: ${{parameters.SDKType}} - ServiceDirectory: ${{parameters.ServiceDirectory}} - - task: PythonScript@0 - displayName: 'Generate directories variable for sparse checkout' - inputs: - scriptPath: 'eng/scripts/generate_from_source_pom.py' - arguments: '--set-pipeline-variable CheckoutDirectories --project-list $(ProjectList)' - workingDirectory: '$(System.DefaultWorkingDirectory)' - - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml - parameters: - Paths: $(CheckoutDirectories) - SkipDefaultCheckout: true - - template: ../../eng/pipelines/templates/steps/install-reporting-tools.yml - - task: Maven@3 - displayName: 'Build for From Source run' - inputs: - mavenPomFile: ClientFromSourcePom.xml - goals: 'install' - # Build and install every track 2, client, library. The purpose is to have all the libraries installed on the - # machine, so we can simply run tests with the -amd switch and we can remove the SNAFU of dependencies that - # bloated the ci.yml files' AdditionalModules because we ended up having to list every transitive azure client - # dependency. Note: The -T 1C says spin up a build thread per core. Since we're building - # all the track 2, client, libraries (which is now over 100) this effectively cuts the build time in half. - options: $(DefaultOptions) -DskipTests $(DefaultSkipOptions) -Djacoco.skip=true -T ${{ parameters.BuildParallelization }} ${{ parameters.AdditionalBuildOptions }} - mavenOptions: '$(MemoryOptions) $(LoggingOptions)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: $(JavaTestVersion) - jdkArchitectureOption: 'x64' - publishJUnitResults: false - condition: and(succeeded(), eq(variables['TestFromSource'], 'true')) - - task: Maven@3 - displayName: 'Run tests for From Source run' - inputs: - mavenPomFile: ClientFromSourcePom.xml - # For the "From Source" runs we don't want the -am switch as we don't care about running tests for our - # dependencies, but we do want the -amd switch because we want to run tests on things that depend on us. - ${{ if eq(parameters.IsLiveTest, 'true') }}: - options: $(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -T ${{ parameters.TestParallelization }} - ${{ else }}: - options: $(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -amd -T ${{ parameters.TestParallelization }} - mavenOptions: '$(MemoryOptions) $(LoggingOptions)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: $(JavaTestVersion) - jdkArchitectureOption: 'x64' - publishJUnitResults: false - # The "From Source" runs only care about running tests for libraries within an SDK/area - # as well as libraries which depend on them and not the other stages in the Maven - # lifecycle that test or verify targets would execute. The libraries were already - # compiled and installed in the previous task, this tasks only runs tests. - goals: ${{ parameters.TestGoals }} - env: ${{ parameters.TestEnvVars }} - condition: and(succeeded(), eq(variables['TestFromSource'], 'true')) \ No newline at end of file +steps: + - task: Maven@3 + displayName: 'Run tests' + inputs: + mavenPomFile: sdk/spring/pom.xml + options: '$(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -T ${{ parameters.TestParallelization }}' + mavenOptions: '$(MemoryOptions) $(LoggingOptions)' + javaHomeOption: 'JDKVersion' + jdkVersionOption: $(JavaTestVersion) + jdkArchitectureOption: 'x64' + publishJUnitResults: false + goals: ${{ parameters.TestGoals }} + env: ${{ parameters.TestEnvVars }} + # we want to run this when TestFromSource isn't true + condition: and(succeeded(), ne(variables['TestFromSource'], 'true')) \ No newline at end of file diff --git a/sdk/spring/compatibility.yml b/sdk/spring/compatibility.yml deleted file mode 100644 index 8e7faa895b80..000000000000 --- a/sdk/spring/compatibility.yml +++ /dev/null @@ -1,227 +0,0 @@ -trigger: none -pr: none - -parameters: - - name: Artifacts - type: object - default: - - name: spring-cloud-azure-core - groupId: com.azure.spring - safeName: springcloudazurecore - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-cloud-azure-service - groupId: com.azure.spring - safeName: springcloudazureservice - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-cloud-azure-resourcemanager - groupId: com.azure.spring - safeName: springcloudazureresourcemanager - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-cloud-azure-trace-sleuth - groupId: com.azure.spring - safeName: springcloudazuretracesleuth - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-messaging-azure - groupId: com.azure.spring - safeName: springmessagingazure - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-messaging-azure-eventhubs - groupId: com.azure.spring - safeName: springmessagingazureeventhubs - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-messaging-azure-servicebus - groupId: com.azure.spring - safeName: springmessagingazureservicebus - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-messaging-azure-storage-queue - groupId: com.azure.spring - safeName: springmessagingazurestoragequeue - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-integration-azure-core - groupId: com.azure.spring - safeName: springintegrationazurecore - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-integration-azure-eventhubs - groupId: com.azure.spring - safeName: springintegrationazureeventhubs - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-integration-azure-servicebus - groupId: com.azure.spring - safeName: springintegrationazureservicebus - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-integration-azure-storage-queue - groupId: com.azure.spring - safeName: springintegrationazurestoragequeue - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-cloud-azure-autoconfigure - groupId: com.azure.spring - safeName: springcloudazureautoconfigure - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-cloud-azure-actuator - groupId: com.azure.spring - safeName: springcloudazureactuator - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-cloud-azure-actuator-autoconfigure - groupId: com.azure.spring - safeName: springcloudazureactuatorautoconfigure - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter - groupId: com.azure.spring - safeName: springcloudazurestarter - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-actuator - groupId: com.azure.spring - safeName: springcloudazurestarteractuator - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-appconfiguration - groupId: com.azure.spring - safeName: springcloudazurestarterappconfiguration - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-cosmos - groupId: com.azure.spring - safeName: springcloudazurestartercosmos - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-data-cosmos - groupId: com.azure.spring - safeName: springcloudazurestarterdatacosmos - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-eventhubs - groupId: com.azure.spring - safeName: springcloudazurestartereventhubs - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-keyvault-certificates - groupId: com.azure.spring - safeName: springcloudazurestarterkeyvaultcertificates - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-keyvault-secrets - groupId: com.azure.spring - safeName: springcloudazurestarterkeyvaultsecrets - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-servicebus - groupId: com.azure.spring - safeName: springcloudazurestarterservicebus - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-servicebus-jms - groupId: com.azure.spring - safeName: springcloudazurestarterservicebusjms - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-storage-blob - groupId: com.azure.spring - safeName: springcloudazurestarterstorageblob - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-storage-file-share - groupId: com.azure.spring - safeName: springcloudazurestarterstoragefileshare - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-storage-queue - groupId: com.azure.spring - safeName: springcloudazurestarterstoragequeue - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-integration-eventhubs - groupId: com.azure.spring - safeName: springcloudazurestarterintegrationeventhubs - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-integration-servicebus - groupId: com.azure.spring - safeName: springcloudazurestarterintegrationservicebus - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-integration-storage-queue - groupId: com.azure.spring - safeName: springcloudazurestarterintegrationstoragequeue - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-stream-binder-servicebus-core - groupId: com.azure.spring - safeName: springcloudazurestreambinderservicebuscore - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-cloud-azure-stream-binder-servicebus - groupId: com.azure.spring - safeName: springcloudazurestreambinderservicebus - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-cloud-azure-stream-binder-eventhubs - groupId: com.azure.spring - safeName: springcloudazurestreambindereventhubs - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-cloud-azure-stream-binder-eventhubs-core - groupId: com.azure.spring - safeName: springcloudazurestreambindereventhubscore - skipPublishDocMs: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-stream-eventhubs - groupId: com.azure.spring - safeName: springcloudazurestarterstreameventhubs - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-stream-servicebus - groupId: com.azure.spring - safeName: springcloudazurestarterstreamservicebus - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-active-directory - groupId: com.azure.spring - safeName: springcloudazurestarteractivedirectory - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - - name: spring-cloud-azure-starter-active-directory-b2c - groupId: com.azure.spring - safeName: springcloudazurestarteractivedirectoryb2c - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - -stages: - - template: ../../../../sdk/spring/compatibility-test.yml - parameters: - Artifacts: ${{ parameters.Artifacts }} \ No newline at end of file From 4f43f54d8d42e8ce47a0ecd2239038520e82a34e Mon Sep 17 00:00:00 2001 From: Muyao Feng Date: Tue, 10 May 2022 15:46:53 +0800 Subject: [PATCH 3/8] add pipeline --- sdk/spring/compatibility-test.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sdk/spring/compatibility-test.yml b/sdk/spring/compatibility-test.yml index c008feadd491..8c49767c1b5c 100644 --- a/sdk/spring/compatibility-test.yml +++ b/sdk/spring/compatibility-test.yml @@ -1,18 +1,19 @@ trigger: none pr: none +pool: + vmImage: "ubuntu-latest" + steps: + - variables: + - template: ../../eng/pipelines/templates/variables/globals.yml - task: Maven@3 displayName: 'Run tests' inputs: mavenPomFile: sdk/spring/pom.xml - options: '$(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -T ${{ parameters.TestParallelization }}' - mavenOptions: '$(MemoryOptions) $(LoggingOptions)' + options: ' -Dcheckstyle.skip=true -Dcodesnippet.skip -Denforcer.skip -Djacoco.skip=true -Dmaven.javadoc.skip=true -Drevapi.skip=true -Dspotbugs.skip=true' + mavenOptions: '$(MemoryOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: $(JavaTestVersion) jdkArchitectureOption: 'x64' - publishJUnitResults: false - goals: ${{ parameters.TestGoals }} - env: ${{ parameters.TestEnvVars }} - # we want to run this when TestFromSource isn't true - condition: and(succeeded(), ne(variables['TestFromSource'], 'true')) \ No newline at end of file + goals: 'clean install -Pdev -T 4 -ntp' From 0a3839833c1e85424836d433cbbede8e78d5dac8 Mon Sep 17 00:00:00 2001 From: Muyao Feng Date: Tue, 10 May 2022 15:47:18 +0800 Subject: [PATCH 4/8] test start --- sdk/spring/tests.yml | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/sdk/spring/tests.yml b/sdk/spring/tests.yml index 318d5910b331..c7f18f3fa341 100644 --- a/sdk/spring/tests.yml +++ b/sdk/spring/tests.yml @@ -1,21 +1,20 @@ trigger: none +pr: none + +pool: + vmImage: "ubuntu-latest" + +steps: + - variables: + - template: ../../eng/pipelines/templates/variables/globals.yml + - task: Maven@3 + displayName: 'Run tests' + inputs: + mavenPomFile: sdk/spring/pom.xml + options: ' -Dcheckstyle.skip=true -Dcodesnippet.skip -Denforcer.skip -Djacoco.skip=true -Dmaven.javadoc.skip=true -Drevapi.skip=true -Dspotbugs.skip=true' + mavenOptions: '$(MemoryOptions)' + javaHomeOption: 'JDKVersion' + jdkVersionOption: $(JavaTestVersion) + jdkArchitectureOption: 'x64' + goals: 'clean install -Pdev -T 4 -ntp' -stages: - - template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml - parameters: - Clouds: 'Public' - TestResourceDirectories: - - spring/spring-cloud-azure-test-eventhubs-binder - - spring/spring-cloud-azure-test-servicebus-binder - Artifacts: - - name: spring-cloud-azure-test-eventhubs-binder - groupId: com.azure.spring - safeName: springcloudazuretesteventhubsbinder - - name: spring-cloud-azure-test-servicebus-binder - groupId: com.azure.spring - safeName: springcloudazuretestservicebusbinder - TimeoutInMinutes: 240 - ServiceDirectory: spring - TestName: IntegrationTestInAzureGlobal - TestGoals: 'verify' - TestOptions: '-DskipSpringITs=false' From 9e7c04eeb6ab848391488fd60ac7b22aaf3fcb6e Mon Sep 17 00:00:00 2001 From: Muyao Feng Date: Tue, 10 May 2022 15:50:24 +0800 Subject: [PATCH 5/8] test start --- sdk/spring/tests.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sdk/spring/tests.yml b/sdk/spring/tests.yml index c7f18f3fa341..bb91d3fd5501 100644 --- a/sdk/spring/tests.yml +++ b/sdk/spring/tests.yml @@ -3,10 +3,9 @@ pr: none pool: vmImage: "ubuntu-latest" - +variables: + - template: ../../eng/pipelines/templates/variables/globals.yml steps: - - variables: - - template: ../../eng/pipelines/templates/variables/globals.yml - task: Maven@3 displayName: 'Run tests' inputs: From 2351022ad615b864ae1025a9ea1130559fe189e2 Mon Sep 17 00:00:00 2001 From: Muyao Feng Date: Tue, 10 May 2022 16:13:30 +0800 Subject: [PATCH 6/8] test start --- sdk/spring/tests.yml | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/sdk/spring/tests.yml b/sdk/spring/tests.yml index bb91d3fd5501..ecbd5ed0edda 100644 --- a/sdk/spring/tests.yml +++ b/sdk/spring/tests.yml @@ -1,19 +1,26 @@ trigger: none pr: none -pool: - vmImage: "ubuntu-latest" variables: - template: ../../eng/pipelines/templates/variables/globals.yml -steps: - - task: Maven@3 - displayName: 'Run tests' - inputs: - mavenPomFile: sdk/spring/pom.xml - options: ' -Dcheckstyle.skip=true -Dcodesnippet.skip -Denforcer.skip -Djacoco.skip=true -Dmaven.javadoc.skip=true -Drevapi.skip=true -Dspotbugs.skip=true' - mavenOptions: '$(MemoryOptions)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: $(JavaTestVersion) - jdkArchitectureOption: 'x64' - goals: 'clean install -Pdev -T 4 -ntp' + +stages: + - stage: + jobs: + - job: + + pool: + vmImage: "ubuntu-latest" + + steps: + - task: Maven@3 + displayName: 'Run tests' + inputs: + mavenPomFile: sdk/spring/pom.xml + options: ' -Dcheckstyle.skip=true -Dcodesnippet.skip -Denforcer.skip -Djacoco.skip=true -Dmaven.javadoc.skip=true -Drevapi.skip=true -Dspotbugs.skip=true' + mavenOptions: '$(MemoryOptions)' + javaHomeOption: 'JDKVersion' + jdkVersionOption: $(JavaTestVersion) + jdkArchitectureOption: 'x64' + goals: 'clean install -Pdev -T 4 -ntp' From f1677d93b02be92b3db6f4f44ed92fbdd20bc4b1 Mon Sep 17 00:00:00 2001 From: Muyao Feng Date: Thu, 12 May 2022 08:43:07 +0800 Subject: [PATCH 7/8] Revert "test start" This reverts commit 2351022a --- sdk/spring/tests.yml | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/sdk/spring/tests.yml b/sdk/spring/tests.yml index ecbd5ed0edda..318d5910b331 100644 --- a/sdk/spring/tests.yml +++ b/sdk/spring/tests.yml @@ -1,26 +1,21 @@ trigger: none -pr: none - -variables: - - template: ../../eng/pipelines/templates/variables/globals.yml stages: - - stage: - jobs: - - job: - - pool: - vmImage: "ubuntu-latest" - - steps: - - task: Maven@3 - displayName: 'Run tests' - inputs: - mavenPomFile: sdk/spring/pom.xml - options: ' -Dcheckstyle.skip=true -Dcodesnippet.skip -Denforcer.skip -Djacoco.skip=true -Dmaven.javadoc.skip=true -Drevapi.skip=true -Dspotbugs.skip=true' - mavenOptions: '$(MemoryOptions)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: $(JavaTestVersion) - jdkArchitectureOption: 'x64' - goals: 'clean install -Pdev -T 4 -ntp' - + - template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml + parameters: + Clouds: 'Public' + TestResourceDirectories: + - spring/spring-cloud-azure-test-eventhubs-binder + - spring/spring-cloud-azure-test-servicebus-binder + Artifacts: + - name: spring-cloud-azure-test-eventhubs-binder + groupId: com.azure.spring + safeName: springcloudazuretesteventhubsbinder + - name: spring-cloud-azure-test-servicebus-binder + groupId: com.azure.spring + safeName: springcloudazuretestservicebusbinder + TimeoutInMinutes: 240 + ServiceDirectory: spring + TestName: IntegrationTestInAzureGlobal + TestGoals: 'verify' + TestOptions: '-DskipSpringITs=false' From b57b04a78255c92e70ec2e3c894f1623fc44ffa6 Mon Sep 17 00:00:00 2001 From: Muyao Feng Date: Thu, 12 May 2022 08:44:23 +0800 Subject: [PATCH 8/8] add new pipeline --- sdk/spring/compatibility-test.yml | 44 ++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/sdk/spring/compatibility-test.yml b/sdk/spring/compatibility-test.yml index 8c49767c1b5c..6faaee65856e 100644 --- a/sdk/spring/compatibility-test.yml +++ b/sdk/spring/compatibility-test.yml @@ -1,19 +1,33 @@ trigger: none pr: none -pool: - vmImage: "ubuntu-latest" +variables: + - template: ../../eng/pipelines/templates/variables/globals.yml -steps: - - variables: - - template: ../../eng/pipelines/templates/variables/globals.yml - - task: Maven@3 - displayName: 'Run tests' - inputs: - mavenPomFile: sdk/spring/pom.xml - options: ' -Dcheckstyle.skip=true -Dcodesnippet.skip -Denforcer.skip -Djacoco.skip=true -Dmaven.javadoc.skip=true -Drevapi.skip=true -Dspotbugs.skip=true' - mavenOptions: '$(MemoryOptions)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: $(JavaTestVersion) - jdkArchitectureOption: 'x64' - goals: 'clean install -Pdev -T 4 -ntp' +stages: + - stage: + jobs: + - job: + + pool: + vmImage: "ubuntu-latest" + + steps: + - script: | + pip install termcolor + displayName: 'python module install' + - script: | + python ./sdk/spring/scripts/compatibility_add_dependencymanagement.py -b 2.6.6 -c 2021.0.1 + displayName: 'add dependency management' + - script: | + python ./sdk/spring/scripts/compatibility_deleted_version.py + displayName: 'delete version control' + - task: Maven@3 + displayName: 'Run tests' + inputs: + mavenPomFile: sdk/spring/pom.xml + mavenOptions: '$(MemoryOptions)' + javaHomeOption: 'JDKVersion' + jdkVersionOption: $(JavaTestVersion) + jdkArchitectureOption: 'x64' + goals: 'clean test -Pdev'