updating pipeline yml

.mvn/community-maven.settings.xml

@@ -7,6 +7,7 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<properties>
+				<gitlab-server>community-maven-via-job-token</gitlab-server>
 				<repo.releases.id>community-maven-repo</repo.releases.id>
 				<publish.snapshots.id>community-maven-via-job-token</publish.snapshots.id>
 				<publish.releases.id>community-maven-via-job-token</publish.releases.id>
@@ -28,6 +29,7 @@
 				</property>
 			</activation>
 			<properties>
+				<gitlab-server>community-maven-via-private-token</gitlab-server>
 				<repo.releases.id>community-maven-repo</repo.releases.id>
 				<publish.snapshots.id>community-maven-via-private-token</publish.snapshots.id>
 				<publish.releases.id>community-maven-via-private-token</publish.releases.id>
@@ -35,6 +37,7 @@
 				<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
 				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/157/packages/maven</publish.snapshots.url>
 				<publish.releases.url>https://community.opengroup.org/api/v4/projects/157/packages/maven</publish.releases.url>
+
 			</properties>
 		</profile>
 	</profiles>

devops/azure/deploy-stage.yaml

-parameters:
-  serviceName: ''
-  chartPath: ''
-  testCoreMavenPomFile: ''
-  valuesFile: ''
-  testCoreMavenOptions: ''
-  skipDeploy: ''
-  skipTest: ''
-  environments: ['dev']
-
-stages:
-  - ${{ each environment in parameters.environments }}:
-      - template: /devops/deploy-stages.yml@TemplateRepo
-      parameters:
-        serviceName: ${{ parameters.serviceName }}
-        chartPath: ${{ parameters.chartPath }}
-        valuesFile: ${{ parameters.valuesFile }}
-        testCoreMavenPomFile: ${parameters.testCoreMavenPomFile}
-        testCoreMavenOptions: ${parameters.testCoreMavenOptions}
-        skipDeploy: ${{ variables.SKIP_DEPLOY }}
-        skipTest: ${{ variables.SKIP_TESTS }}
-        providers:
-          -  name: Azure
-             environments: ${{ environment }}
-      - stage: 'Deploy_Azure_WKS_Mappings_${{ environment }}'
-        jobs:
-          - job: 'Deploy_Azure_WKS_Mappings_${{ environment }}'
-            displayName: 'Deploy_Azure_WKS_Mappings_${{ environment }}'
-            variables:
-              - group: 'Azure Target Env Secrets - ${{ environment }}'
-              - group: 'Azure Target Env - ${{ environment }}'
-              - group: 'Azure Service Release - ${{ parameters.serviceName }}'
-
-              - name: AZURE_DEPLOYMENTS_SUBDIR
-                value: deployments/scripts/azure
-
-            steps:
-              - task: UsePythonVersion@0
-                inputs:
-                  versionSpec: '3.x'
-                  addToPath: true
-                  architecture: 'x64'
-              - task: Bash@3
-                displayName: 'Deploy Mappings'
-                inputs:
-                  targetType: 'inline'
-                  script: |
-                    pip install -r $(AZURE_DEPLOYMENTS_SUBDIR)/requirements.txt
-
-                    export AZURE_MAPPINGS_STORAGE_CONTAINER=$(AZURE_MAPPINGS_STORAGE_CONTAINER)
-                    export AZURE_STORAGE_ACCOUNT_NAME=$(STORAGE_ACCOUNT)
-                    export AZURE_STORAGE_ACCOUNT_KEY=$(STORAGE_ACCOUNT_KEY)
-                    export AZURE_COSMOS_KEY=$(AZURE_COSMOS_KEY)
-                    export AZURE_COSMOS_URL=$(AZURE_COSMOS_URL)
-
-                    python $(AZURE_DEPLOYMENTS_SUBDIR)/deploy_mappings.py
-                    python $(AZURE_DEPLOYMENTS_SUBDIR)/deploy_mappings_info_records.py
\ No newline at end of file

devops/azure/deploy-stage.yml

+#  Copyright � Microsoft Corporation
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+#####################
+# README: Defines an common set of supportive deploy stages that any external app service pipeline can call into.
+#####################
+
+parameters:
+  providers: []
+  serviceName: ''
+  hldRegPath: "providers/azure/hld-registry"
+  testCoreMavenPomFile: ''
+  testCoreMavenOptions: ''
+  integrationTestMavenGoal: 'package'
+  testCoreMavenGoal: 'install'
+  skipDeploy: false
+  skipTest: 'false'
+  dockerFile: ''
+  checkoutRepo: self
+
+stages:
+
+  - ${{ each provider in parameters.providers }}:
+      - ${{ each environment in provider.environments }}:
+          - stage: 'Deploy_${{ provider.name }}_${{ environment }}'
+
+            variables:
+              - group: '${{ provider.name }} Target Env Secrets - ${{ environment }}'
+              - group: '${{ provider.name }} Target Env - ${{ environment }}'
+              - group: '${{ provider.name }} Service Release - ${{ parameters.serviceName }}'
+
+              - name: artifactName
+                value: 'drop'
+
+            jobs:
+              - deployment: Deploy
+                pool:
+                  name: $(AGENT_POOL)
+                  demands:
+                    - maven
+                environment: ${{ environment }}
+                strategy:
+                  runOnce:
+                    deploy:
+                      steps:
+                        - download: none
+
+                        - task: DownloadBuildArtifacts@0
+                          displayName: 'Pull Build Artifacts'
+                          inputs:
+                            artifactName: '${{ variables.artifactName }}'
+                            downloadPath: '$(System.DefaultWorkingDirectory)'
+
+                        - template: deployment-steps.yml
+                          parameters:
+                            serviceName: ${{ parameters.serviceName }}
+                            providerName: ${{ provider.name }}
+                            testCoreMavenPomFile: ${{ parameters.testCoreMavenPomFile }}
+                            testCoreMavenGoal: ${{ parameters.testCoreMavenGoal }}
+                            integrationTestMavenGoal: ${{ parameters.integrationTestMavenGoal }}
+                            testCoreMavenOptions: ${{ parameters.testCoreMavenOptions }}
+                            artifactName: ${{ variables.artifactName }}
+                            elasticEndpoint: $(ELASTIC_ENDPOINT)
+                            environment: ${{ environment }}
+                            chartPath: ${{ parameters.chartPath }}
+                            valuesFile: ${{ parameters.valuesFile }}
+                            dockerFile: ${{ parameters.dockerFile }}
+                            hldRegPath: ${{ parameters.hldRegPath }}
+                            skipDeploy: ${{ parameters.skipDeploy }}
+                            skipTest: ${{ parameters.skipTest }}
+                            runPythonTest: ${{ parameters.runPythonTest }}
+                            testPythonFilePath: ${{ parameters.testPythonFilePath }}
+                            testPythonFile: ${{ parameters.testPythonFile }}
+                            checkoutRepo: ${{ parameters.checkoutRepo }}

devops/azure/deployment-steps.yml

+#  Copyright � Microsoft Corporation
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+#####################
+# README: Defines a common set of deployment steps that the deploy stage can call into.
+#####################
+
+parameters:
+  artifactName: 'drop'
+  serviceName: ''
+  providerName: ''
+  jarFilePattern: '*-SNAPSHOT*.jar'
+  integrationTestMavenGoal: 'package'
+  mavenPublishJUnitResults: false
+  testCoreMavenPomFile: ''
+  testCoreMavenGoal: 'install'
+  testCoreMavenOptions: ''
+  testArtifactLocation: 'drop/deploy'
+  elasticEndpoint: ''
+  skipTest: ''
+  dockerFile: ''
+  testPythonFilePath: ''
+  testPythonFile: ''
+  runPythonTest: ''
+  checkoutRepo: self
+
+steps:
+  - template: /devops/tasks/detect-jar.yml@TemplateRepo
+    parameters:
+      stepName: DetectJarScript
+      providerName: ${{ parameters.providerName }}
+      pomFilePath: $(MAVEN_DEPLOY_POM_FILE_PATH)
+      jarFilePattern: ${{ parameters.jarFilePattern }}
+
+  - template: /devops/tasks/acr-publish.yml@TemplateRepo
+    parameters:
+      environment: ${{ parameters.environment }}
+      jarFilePath: $(DetectJarScript.JAR_FILE_PATH)
+      providerName: ${{ parameters.providerName }}
+      imageRepoName: ${{ parameters.serviceName }}
+      artifactName: ${{ parameters.artifactName }}
+      dockerFile: ${{ parameters.dockerFile }}
+
+  - template: /devops/tasks/aks-deployment-steps.yml@TemplateRepo
+    parameters:
+      serviceName: ${{ parameters.serviceName }}
+      providerName: ${{ parameters.providerName }}
+      environment: ${{ parameters.environment }}
+      chartPath: ${{ parameters.chartPath }}
+      valuesFile: ${{ parameters.valuesFile }}
+      hldRegPath: ${{ parameters.hldRegPath }}
+      skipDeploy: ${{ parameters.skipDeploy }}
+      checkoutRepo: ${{ parameters.checkoutRepo }}
+
+  - task: ExtractFiles@1
+    displayName: 'Extract ${{parameters.serviceName}} integration test suite '
+    inputs:
+      archiveFilePatterns: '$(System.DefaultWorkingDirectory)/${{ parameters.artifactName }}/${{parameters.serviceName}}-integration-tests.zip'
+      destinationFolder: '$(System.DefaultWorkingDirectory)/${{ parameters.testArtifactLocation }}'
+
+  - template: /devops/tasks/elastic-setup.yml@TemplateRepo
+    parameters:
+      stepName: ExtractElasticHostAndPort
+      providerName: ${{ parameters.providerName }}
+      elasticEndpoint: ${{ parameters.elasticEndpoint }}
+
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.x'
+      addToPath: true
+      architecture: 'x64'
+  - task: Bash@3
+    displayName: 'Deploy Mappings'
+    inputs:
+      targetType: 'inline'
+      script: |
+        pip install -r $(System.DefaultWorkingDirectory)/${{ parameters.artifactName }}/deployments/scripts/azure/requirements.txt
+
+        export AZURE_MAPPINGS_STORAGE_CONTAINER=$(AZURE_MAPPINGS_STORAGE_CONTAINER)
+        export AZURE_STORAGE_ACCOUNT_NAME=$(STORAGE_ACCOUNT)
+        export AZURE_STORAGE_ACCOUNT_KEY=$(STORAGE_ACCOUNT_KEY)
+        export AZURE_COSMOS_KEY=$(AZURE_COSMOS_KEY)
+        export AZURE_COSMOS_URL=$(AZURE_COSMOS_URL)
+
+        python $(System.DefaultWorkingDirectory)/${{ parameters.artifactName }}/deployments/scripts/azure/deploy_mappings.py
+        python $(System.DefaultWorkingDirectory)/${{ parameters.artifactName }}/deployments/scripts/azure/deploy_mapping_info_records.py
+
+  - task: Maven@3
+    displayName: 'Maven build, test, and install ${{parameters.providerName}}-test-core'
+    condition: ne('${{ parameters.testCoreMavenPomFile }}', '')
+    inputs:
+      mavenPomFile: '$(System.DefaultWorkingDirectory)/${{ parameters.testArtifactLocation }}/${{ parameters.testCoreMavenPomFile }}'
+      goals: ${{ parameters.testCoreMavenGoal }}
+      options: ${{ parameters.testCoreMavenOptions }}
+      publishJUnitResults: ${{ parameters.mavenPublishJUnitResults }}
+
+  - template: /devops/tasks/flux-service-wait.yml@TemplateRepo
+    parameters:
+      serviceName: ${{parameters.serviceName}}
+      environment: ${{ parameters.environment }}
+      imageRepoName: '${{ parameters.serviceName }}'
+
+  - task: Maven@3
+    displayName: 'Maven run integration test'
+    condition: and(succeeded(), eq('${{ parameters.skipTest }}', 'false'))
+    inputs:
+      mavenPomFile: '$(System.DefaultWorkingDirectory)/$(MAVEN_INTEGRATION_TEST_POM_FILE_PATH)'
+      goals: ${{ parameters.integrationTestMavenGoal }}
+      options: $(MAVEN_INTEGRATION_TEST_OPTIONS)
+      publishJUnitResults: ${{ parameters.mavenPublishJUnitResults }}
+
+  - template: /devops/tasks/python-integration-test.yml@TemplateRepo
+    parameters:
+      stepName: PythonRunIntegrationTests
+      testPythonFilePath: ${{ parameters.testPythonFilePath }}
+      testPythonFile: ${{ parameters.testPythonFile }}
+      runPythonTest: ${{ parameters.runPythonTest }}

devops/azure/development-pipeline.yml

@@ -13,16 +13,17 @@
 #  limitations under the License.
 
 trigger:
-  batch: true
-  branches:
-    include:
-      - azure/AddingDevPipeline
-  paths:
-    exclude:
-      - /**/*.md
-      - .gitignore
-      - /docs
-      - /provider/wks-gcp
+  none
+#   batch: true
+#   branches:
+#     include:
+#       - azure/AddingDevPipeline
+#   paths:
+#     exclude:
+#       - /**/*.md
+#       - .gitignore
+#       - /docs
+#       - /provider/wks-gcp
 
 resources:
   repositories:
@@ -63,18 +64,23 @@ stages:
         provider/wks-azure/pom.xml
         provider/wks-azure/target/*-spring-boot.jar
         .mvn/community-maven.settings.xml
+        deployments/scripts/azure/*.py
+        deployments/mapping_info_records/opendes/*.json
+        deployments/mappings/opendes/*.json
+        deployments/scripts/azure/*.txt
       copyFileContentsToFlatten: ''
       mavenSettingsFile: '.mvn/community-maven.settings.xml'
       serviceBase: ${{ variables.serviceName }}
       testingRootFolder: 'testing'
       chartPath: ${{ variables.chartPath }}
-  - template: deploy-stage.yaml
+  - template: deploy-stage.yml
     parameters:
       serviceName: ${{ variables.serviceName }}
       chartPath: ${{ variables.chartPath }}
       valuesFile: ${{ variables.valuesFile }}
       testCoreMavenPomFile: 'testing/wks-test-core/pom.xml'
-      testCoreMavenOptions: '--settings $(System.DefaultWorkingDirectory)/drop/.mvn/community-maven.settings.xml'
+      testCoreMavenOptions: '--settings $(System.DefaultWorkingDirectory)/drop/.mvn/community-maven.settings.xml -DskipTests -DskipITs'
+      integrationTestMavenGoal: 'verify'
       skipDeploy: ${{ variables.SKIP_DEPLOY }}
       skipTest: ${{ variables.SKIP_TESTS }}
       providers:

provider/wks-azure/Readme.md

@@ -70,6 +70,7 @@ In order to run the service locally, you will need to have the following environ
 | `OS_TARGET_SCHEMA_KIND` | ex `slb:oga:wellbore:1.0.0` | Schema kind for WKS records, takes a default value as (slb:wks:wellbore:1.3.1)| no | - |
 | `OS_TARGET_SCHEMA_KIND_TENANT` | ex `opendes:oga:wellbore:1.0.0` | Schema kind for WKS records with tenant name, takes a default value as (opendes:wks:wellbore:1.3.1)| no | - |
 | `DATA_PARTITION_ID` | ex `opendes` | data partition id| no | - |
+| `TENANT_NAME` | ex `opendes` | tenant name | no | - |
 
 
 ### Build and run the application