Commit 7d7d26e6 authored by Nicholas Karsky's avatar Nicholas Karsky
Browse files

Merge branch 'partition_service' into 'master'

Updates for Parition Service

See merge request osdu/platform/system/delivery!33
parents 5d9c6cd0 33c8de7e
Pipeline #11836 failed with stages
in 73 minutes and 56 seconds
......@@ -17,6 +17,7 @@ buildNumber.properties
.vscode/
.DS_Store
*.env
.envrc
/dist/
# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
......
# This file contains the essential configs for the osdu on azure helm chart
global:
# Service(s) Replica Count
replicaCount: 1
################################################################################
# Specify the Gitlab branch being used for image creation
# ie: community.opengroup.org:5555/osdu/platform/system/storage/{{ .Values.global.branch }}/storage:latest
#
image:
repository: #{container-registry}#.azurecr.io
branch: #{ENVIRONMENT_NAME}#
tag: #{Build.SourceVersion}#
......@@ -65,19 +65,19 @@ spec:
key: ENV_KEYVAULT
- name: AZURE_TENANT_ID
valueFrom:
configMapKeyRef:
name: osdu-svc-properties
key: ENV_TENANT_ID
secretKeyRef:
name: active-directory
key: tenantid
- name: AZURE_CLIENT_ID
valueFrom:
secretKeyRef:
name: clientid
key: clientid
name: active-directory
key: principal-clientid
- name: AZURE_CLIENT_SECRET
valueFrom:
secretKeyRef:
name: clientpassword
key: clientpassword
name: active-directory
key: principal-clientpassword
- name: SEARCH_QUERY_LIMIT
value: "1000"
- name: BATCH_SIZE
......
......@@ -11,7 +11,9 @@ trigger:
exclude:
- /**/*.md
- .gitignore
- images/
- /provider/delivery-aws
- /provider/delivery-gcp
- /provider/delivery-ibm
pr:
autoCancel: true
......@@ -26,22 +28,35 @@ pr:
resources:
repositories:
- repository: osdu-infrastructure
type: git
name: osdu-r2/osdu-infrastructure
- repository: FluxRepo
type: git
name: k8-gitops-manifests
- repository: TemplateRepo
type: git
name: infra-azure-provisioning
variables:
- group: 'Azure Common Secrets'
- group: 'Azure - Common'
- group: 'Azure - OSDU'
- group: 'Azure - OSDU Secrets'
- name: serviceName
value: 'delivery'
- name: chartPath
value: "devops/azure/chart"
- name: valuesFile
value: "devops/azure/chart/helm-config.yaml"
- name: 'MANIFEST_REPO'
value: $[ resources.repositories['FluxRepo'].name ]
- name: SKIP_TESTS
value: 'false'
stages:
- template: devops/service-pipelines/build-stage.yml@osdu-infrastructure
- template: /devops/build-stage.yml@TemplateRepo
parameters:
mavenGoal: 'package'
mavenPublishJUnitResults: true
serviceCoreMavenOptions: '-P delivery-core'
mavenOptions: '-P delivery-azure'
copyFileContents: |
pom.xml
......@@ -52,11 +67,16 @@ stages:
mavenSettingsFile: './maven/settings.xml'
serviceBase: ${{ variables.serviceName }}
testingRootFolder: 'testing'
- template: devops/service-pipelines/deploy-stages.yml@osdu-infrastructure
chartPath: ${{ variables.chartPath }}
- template: /devops/deploy-stages.yml@TemplateRepo
parameters:
serviceName: ${{ variables.serviceName }}
chartPath: ${{ variables.chartPath }}
valuesFile: ${{ variables.valuesFile }}
testCoreMavenPomFile: 'testing/delivery-test-core/pom.xml'
testCoreMavenOptions: '--settings $(System.DefaultWorkingDirectory)/drop/deploy/testing/maven/settings.xml'
skipDeploy: ${{ variables.SKIP_DEPLOY }}
skipTest: ${{ variables.SKIP_TESTS }}
providers:
- name: Azure
environments: ['dev']
......@@ -11,7 +11,9 @@ trigger:
exclude:
- /**/*.md
- .gitignore
- images/
- /provider/delivery-aws
- /provider/delivery-gcp
- /provider/delivery-ibm
pr:
autoCancel: true
......@@ -26,22 +28,35 @@ pr:
resources:
repositories:
- repository: osdu-infrastructure
type: git
name: osdu-r2/osdu-infrastructure
- repository: FluxRepo
type: git
name: k8-gitops-manifests
- repository: TemplateRepo
type: git
name: infra-azure-provisioning
variables:
- group: 'Azure Common Secrets'
- group: 'Azure - Common'
- group: 'Azure - OSDU'
- group: 'Azure - OSDU Secrets'
- name: serviceName
value: 'delivery'
- name: chartPath
value: "devops/azure/chart"
- name: valuesFile
value: "devops/azure/chart/helm-config.yaml"
- name: 'MANIFEST_REPO'
value: $[ resources.repositories['FluxRepo'].name ]
- name: SKIP_TESTS
value: 'true'
stages:
- template: devops/service-pipelines/build-stage.yml@osdu-infrastructure
- template: /devops/build-stage.yml@TemplateRepo
parameters:
mavenGoal: 'package'
mavenPublishJUnitResults: true
serviceCoreMavenOptions: '-P delivery-core'
mavenOptions: '-P delivery-azure'
copyFileContents: |
pom.xml
......@@ -52,11 +67,16 @@ stages:
mavenSettingsFile: './maven/settings.xml'
serviceBase: ${{ variables.serviceName }}
testingRootFolder: 'testing'
- template: devops/service-pipelines/deploy-stages.yml@osdu-infrastructure
chartPath: ${{ variables.chartPath }}
- template: /devops/deploy-stages.yml@TemplateRepo
parameters:
serviceName: ${{ variables.serviceName }}
chartPath: ${{ variables.chartPath }}
valuesFile: ${{ variables.valuesFile }}
testCoreMavenPomFile: 'testing/delivery-test-core/pom.xml'
testCoreMavenOptions: '--settings $(System.DefaultWorkingDirectory)/drop/deploy/testing/maven/settings.xml'
skipDeploy: ${{ variables.SKIP_DEPLOY }}
skipTest: ${{ variables.SKIP_TESTS }}
providers:
- name: Azure
environments: ['demo']
......@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>delivery-azure</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>
<description>Delivery service on Azure</description>
<packaging>jar</packaging>
......@@ -41,7 +41,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>0.3.2</version>
<version>0.3.12</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......
......@@ -15,3 +15,10 @@ JAVA_GC_OPTS=-XX:+UseG1GC -XX:+UseStringDeduplication -XX:InitiatingHeapOccupanc
SEARCH_QUERY_RECORD_HOST=https://${SEARCH_HOST}/api/search/v2/query
SEARCH_QUERY_LIMIT=${SEARCH_QUERY_LIMIT}
SEARCH_BATCH_SIZE=${BATCH_SIZE}
# Partition Service configuration
PARTITION_API=${partition_service_endpoint}
azure.activedirectory.app-resource-id=${aad_client_id}
azure.cosmosdb.database=${cosmosdb_database}
......@@ -161,7 +161,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
<version>0.0.28</version>
<version>0.0.33</version>
<scope>test</scope>
<exclusions>
<exclusion>
......
......@@ -21,7 +21,7 @@ import org.junit.runner.RunWith;
@RunWith(Cucumber.class)
@CucumberOptions(
features = "classpath:",
features = "classpath:features.deliveryrecord/DeliveryRecord.feature",
glue = {"classpath:org.opengroup.osdu.step_definitions.delivery.record"},
plugin = {"pretty", "junit:target/cucumber-reports/TEST-deliveryrecord.xml"}
)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment