Commit 9eb8031c authored by Yan Sushchynski (EPAM)'s avatar Yan Sushchynski (EPAM)
Browse files

Merge branch 'master' of...

Merge branch 'master' of community.opengroup.org:osdu/platform/domain-data-mgmt-services/seismic/seismic-dms-suite/seismic-store-service into fix_Anthos_logger_minio
parents 6cabc36d b815a709
Pipeline #129736 failed with stages
in 45 minutes and 18 seconds
......@@ -28,7 +28,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
### Common variables
| Name | Description | Type | Default |Required |
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|---------|
**logLevel** | logging level | string | "INFO" | yes
**cloudProvider** | cloud provider | string | "google" | yes
......@@ -47,7 +47,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
### GCP variables
| Name | Description | Type | Default |Required |
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|---------|
**impServiceAccountSigner** | imp SA signer | string | "NA" | yes
**seistoreDesAppkey** | seismic-store app key | string | "NA" | yes
......@@ -56,14 +56,14 @@ First you need to set variables in **values.yaml** file using any code editor. S
### On-prem variables
| Name | Description | Type | Default |Required |
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|---------|
**apiBasePath** | base api url path | string | "/api/v3" | yes
**serviceEnv** | service environment | string | "dev" | yes
### Config variables
| Name | Description | Type | Default |Required |
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|---------|
**appName** | name of the app | string | "seismic-store" | yes
**configmap** | configmap to be used | string | "seismic-store-config" | yes
......
......@@ -29,7 +29,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
### Common variables
| Name | Description | Type | Default |Required |
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|---------|
**requestsCpu** | amount of requested CPU | string | "0.1" | yes
**requestsMemory** | amount of requested memory| string | "256M" | yes
......@@ -41,7 +41,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
### Config variables
| Name | Description | Type | Default |Required |
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|---------|
**configmap** | configmap to be used | string | "seismic-store-config" | yes
**appName** | name of the app | string | "seismic-store" | yes
......@@ -49,6 +49,8 @@ First you need to set variables in **values.yaml** file using any code editor. S
### On-prem variables
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|---------|
**database** | secret for database | string | "seismic-store-db-secret" | yes
**keycloak** | secret for keycloak | string | "seismic-store-keycloak-secret" | yes
**minio** | secret for minio | string | "seismic-store-minio-secret" | yes
......
......@@ -23,17 +23,17 @@ sdms-osdu-gcp-containerize-gitlab:
- cd app/$SDMS_SERVICE
- sed -i 's|#{SDMS_PREFIX}#|'$GCP_SDMS_PREFIX'|' ./docs/api/openapi.osdu.yaml
rules:
- if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
- if: '$OSDU_GCP == "1" && $CI_COMMIT_BRANCH =~ /^release/'
when: on_success
changes:
- devops/**/*
- app/sdms/**/*
- if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
- if: '$OSDU_GCP == "1" && $CI_COMMIT_TAG'
when: on_success
changes:
- devops/**/*
- app/sdms/**/*
- if: '$OSDU_GCP == "true"'
- if: '$OSDU_GCP == "1"'
when: on_success
changes:
- devops/**/*
......@@ -50,7 +50,7 @@ sdms-osdu-gcp-containerize-gcr:
- cd app/$SDMS_SERVICE
- sed -i 's|#{SDMS_PREFIX}#|'$GCP_SDMS_PREFIX'|' ./docs/api/openapi.osdu.yaml
rules:
- if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
- if: '$OSDU_GCP == "1" && $CI_COMMIT_TAG'
when: on_success
changes:
- devops/**/*
......@@ -67,7 +67,7 @@ sdms-osdu-gcp-deploy-configmap:
when: never
- if: "$CI_COMMIT_TAG"
when: never
- if: '$OSDU_GCP == "true"'
- if: '$OSDU_GCP == "1"'
when: on_success
changes:
- devops/**/*
......@@ -82,12 +82,12 @@ sdms-osdu-gcp-dev2-deploy-configmap:
SEISMIC_OSDU_GCP_SERVICE: seismic-store
SEISMIC_OSDU_GCP_CHART: gcp-seismic-store-sdms-configmap #var used only in release and tagged pipelines
rules:
- if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
- if: '$OSDU_GCP == "1" && $CI_COMMIT_BRANCH =~ /^release/'
when: on_success
changes:
- devops/**/*
- app/sdms/**/*
- if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
- if: '$OSDU_GCP == "1" && $CI_COMMIT_TAG'
when: on_success
changes:
- devops/**/*
......@@ -104,7 +104,7 @@ sdms-osdu-gcp-anthos-deploy-configmap:
when: never
- if: "$CI_COMMIT_TAG"
when: never
- if: '$OSDU_GCP == "true"'
- if: '$OSDU_GCP == "1"'
when: on_success
changes:
- devops/**/*
......@@ -122,7 +122,7 @@ sdms-osdu-gcp-deployment:
when: never
- if: "$CI_COMMIT_TAG"
when: never
- if: '$OSDU_GCP == "true"'
- if: '$OSDU_GCP == "1"'
when: on_success
changes:
- devops/**/*
......@@ -137,12 +137,12 @@ sdms-osdu-gcp-dev2-deploy-deployment:
SEISMIC_OSDU_GCP_SERVICE: seismic-store
SEISMIC_OSDU_GCP_CHART: gcp-seismic-store-sdms-deploy #var used only in release and tagged pipelines
rules:
- if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
- if: '$OSDU_GCP == "1" && $CI_COMMIT_BRANCH =~ /^release/'
when: on_success
changes:
- devops/**/*
- app/sdms/**/*
- if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
- if: '$OSDU_GCP == "1" && $CI_COMMIT_TAG'
when: on_success
changes:
- devops/**/*
......@@ -160,13 +160,11 @@ sdms-osdu-gcp-anthos-deploy-deployment:
when: never
- if: "$CI_COMMIT_TAG"
when: never
- if: '$OSDU_GCP == "true"'
- if: '$OSDU_GCP == "1"'
when: on_success
changes:
- devops/**/*
- app/sdms/**/*
# Fix it!: delete this after MR 322 feat:ANTHOS merged
allow_failure: true
sdms-osdu-gcp-test-python:
variables:
......@@ -199,7 +197,7 @@ sdms-osdu-gcp-test-python:
when: never
- if: "$CI_COMMIT_TAG"
when: never
- if: '$OSDU_GCP == "true"'
- if: '$OSDU_GCP == "1"'
when: on_success
changes:
- devops/**/*
......@@ -232,12 +230,12 @@ sdms-osdu-gcp-dev2-test-python:
- chmod +x ./tests/e2e/run_e2e_tests.sh
- ./tests/e2e/run_e2e_tests.sh --seistore-svc-url="https://${OSDU_GCP_UNIT_HOSTNAME}${GCP_SDMS_PREFIX}" --seistore-svc-api-key="NA" --user-idtoken="$OSDU_GCP_INTEGRATION_TESTER" --tenant="${OSDU_GCP_TENANT}" --admin-email="${OSDU_GCP_SEISTORE_ADMIN_EMAIL}" --datapartition="${DATA_PARTITION_ID}" --legaltag01="${OSDU_GCP_SEISTORE_LEGALTAG01}" --legaltag02="${OSDU_GCP_SEISTORE_LEGALTAG02}" --VCS-Provider="${ISGITLAB}"
rules:
- if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
- if: '$OSDU_GCP == "1" && $CI_COMMIT_BRANCH =~ /^release/'
when: on_success
changes:
- devops/**/*
- app/sdms/**/*
- if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
- if: '$OSDU_GCP == "1" && $CI_COMMIT_TAG'
when: on_success
changes:
- devops/**/*
......
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