Commit c478568e authored by Oleksii Tsyganov (EPAM)'s avatar Oleksii Tsyganov (EPAM)
Browse files

Resolve conflicts

parents ab8306fb 3acf2ee9
Pipeline #67367 failed with stages
in 37 seconds
variables:
OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"
OSDU_GCP_LOG_LEVEL: INFO
OSDU_GCP_SERVICE: seismic-store
OSDU_GCP_VENDOR: gcp
OSDU_GCP_APPLICATION_NAME: seismic-store
OSDU_GCP_APPLICATION: seismic-store
OSDU_GCP_DATA_PARTITION_REST_HEADER_KEY: data-partition-id
OSDU_GCP_HELM_CONFIG_SERVICE: seismic-store-config
OSDU_GCP_HELM_DEPLOYMENT_SERVICE: seismic-store-deploy
OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.app_environment_identifier=${OSDU_GCP_TENANT} --set data.data_partition_rest_header_key=${OSDU_GCP_DATA_PARTITION_REST_HEADER_KEY} --set data.seistore_des_target_audience=${GOOGLE_AUDIENCE} --set data.service_cloud_project=${OSDU_GCP_PROJECT} --set data.imp_service_account_signer=${OSDU_GCP_IMP_SERVICE_ACCOUNT_SIGNER} --set data.seistore_des_appkey=${OSDU_GCP_SEISTORE_DES_APPKEY} --set data.des_redis_instance_address=${OSDU_GCP_DES_REDIS_INSTANCE_ADDRESS} --set data.locksmap_redis_instance_address=${OSDU_GCP_DES_REDIS_INSTANCE_ADDRESS}"
OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=workload-identity-sdms"
include:
# pipeline logic
- project: "osdu/platform/ci-cd-pipelines"
file: "standard-setup.yml"
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/osdu-gcp-global.yml"
# app
# sdms
- local: "app/sdms/.gitlab-ci.yml"
......@@ -7,7 +7,7 @@ AFL-3.0
========================================================================
The following software have components provided under the terms of this license:
- json-schema (from http://github.com/kriszyp/json-schema)
- json-schema (from https://www.npmjs.com/package/json-schema)
========================================================================
Apache-2.0
......@@ -175,7 +175,7 @@ The following software have components provided under the terms of this license:
- google-gax (from https://www.npmjs.com/package/google-gax)
- idna (from https://github.com/kjd/idna)
- ieee754 (from https://www.npmjs.com/package/ieee754)
- json-schema (from http://github.com/kriszyp/json-schema)
- json-schema (from https://www.npmjs.com/package/json-schema)
- node-forge (from https://www.npmjs.com/package/node-forge)
- node-forge (from https://www.npmjs.com/package/node-forge)
- node-pre-gyp (from https://www.npmjs.com/package/node-pre-gyp)
......@@ -603,10 +603,10 @@ The following software have components provided under the terms of this license:
- isstream (from https://github.com/rvagg/isstream)
- jmespath (from https://github.com/jmespath/jmespath.py)
- jmespath (from https://www.npmjs.com/package/jmespath)
- jsbn (from https://github.com/andyperlitch/jsbn)
- jsbn (from https://www.npmjs.com/package/jsbn)
- json-bigint (from https://www.npmjs.com/package/json-bigint)
- json-bigint (from https://www.npmjs.com/package/json-bigint)
- json-schema (from http://github.com/kriszyp/json-schema)
- json-schema (from https://www.npmjs.com/package/json-schema)
- json-schema-traverse (from https://www.npmjs.com/package/json-schema-traverse)
- json-stringify-safe (from https://github.com/isaacs/json-stringify-safe)
- jsonfile (from https://www.npmjs.com/package/jsonfile)
......@@ -817,7 +817,7 @@ The following software have components provided under the terms of this license:
- tslib (from https://www.npmjs.com/package/tslib)
- tslib (from https://www.npmjs.com/package/tslib)
- tunnel (from https://www.npmjs.com/package/tunnel)
- tweetnacl (from https://dchest.github.io/tweetnacl-js)
- tweetnacl (from https://www.npmjs.com/package/tweetnacl)
- type-fest (from https://www.npmjs.com/package/type-fest)
- type-is (from https://www.npmjs.com/package/type-is)
- typedarray (from https://github.com/substack/typedarray)
......@@ -904,7 +904,7 @@ Unlicense
========================================================================
The following software have components provided under the terms of this license:
- tweetnacl (from https://dchest.github.io/tweetnacl-js)
- tweetnacl (from https://www.npmjs.com/package/tweetnacl)
========================================================================
W3C
......@@ -928,7 +928,7 @@ The following software have components provided under the terms of this license:
- kuler (from https://www.npmjs.com/package/kuler)
- node-forge (from https://www.npmjs.com/package/node-forge)
- node-forge (from https://www.npmjs.com/package/node-forge)
- tweetnacl (from https://dchest.github.io/tweetnacl-js)
- tweetnacl (from https://www.npmjs.com/package/tweetnacl)
========================================================================
unknown
......@@ -938,7 +938,7 @@ The following software have components provided under the terms of this license:
- deep-extend (from https://www.npmjs.com/package/deep-extend)
- for-each (from https://www.npmjs.com/package/for-each)
- jmespath (from https://www.npmjs.com/package/jmespath)
- json-schema (from http://github.com/kriszyp/json-schema)
- json-schema (from https://www.npmjs.com/package/json-schema)
- querystring (from https://www.npmjs.com/package/querystring)
- sax (from https://www.npmjs.com/package/sax)
......
......@@ -45,6 +45,34 @@ variables:
OSDU_GCP_DES_SERVICE_HOST_COMPLIANCE: https://community.osdu-gcp.go3-nrg.projects.epam.com/api
OSDU_GCP_DES_SERVICE_HOST_STORAGE: https://os-storage-attcrcktoa-uc.a.run.app/api
OSDU_GCP_ENV_VARS: CLOUDPROVIDER=${OSDU_GCP_CLOUD_PROVIDER},DES_SERVICE_HOST_PARTITION=${OSDU_GCP_PARTITION_API},ENTITLEMENT_BASE_URL_PATH=${OSDU_GCP_ENTITLEMENT_BASE_URL_PATH},DATA_PARTITION_REST_HEADER_KEY=${OSDU_GCP_DATA_PARTITION_REST_HEADER_KEY},DES_SERVICE_HOST_STORAGE=${OSDU_GCP_DES_SERVICE_HOST_STORAGE},DES_SERVICE_HOST_COMPLIANCE=${OSDU_GCP_DES_SERVICE_HOST_COMPLIANCE},SEISTORE_DES_TARGET_AUDIENCE=${GOOGLE_AUDIENCE},SERVICE_CLOUD_PROJECT=${OSDU_GCP_PROJECT},APP_ENVIRONMENT_IDENTIFIER=${TENANT},IMP_SERVICE_ACCOUNT_SIGNER=${OSDU_GCP_IMP_SERVICE_ACCOUNT_SIGNER},DES_SERVICE_HOST_ENTITLEMENT=${OSDU_GCP_ENTITLEMENTS_V2_BASE_URL},SEISTORE_DES_APPKEY=${OSDU_GCP_SEISTORE_DES_APPKEY},DES_REDIS_INSTANCE_ADDRESS=${OSDU_GCP_DES_REDIS_INSTANCE_ADDRESS},DES_REDIS_INSTANCE_PORT=${OSDU_GCP_DES_REDIS_INSTANCE_PORT},LOCKSMAP_REDIS_INSTANCE_ADDRESS=${OSDU_GCP_LOCKSMAP_REDIS_INSTANCE_ADDRESS},LOCKSMAP_REDIS_INSTANCE_PORT=${OSDU_GCP_LOCKSMAP_REDIS_INSTANCE_PORT} --vpc-connector=$OSDU_GCP_VPC_CONNECTOR
OSDU_GCP_HELM_PACKAGE_CHARTS: "app/sdms/devops/gcp/deploy app/sdms/devops/gcp/configmap"
sdms_osdu-gcp-helm-charts:
stage: build
tags: ['osdu-small']
image:
name: alpine/helm:3.5.4
entrypoint: [""]
artifacts:
paths:
- helm-charts
script:
- mkdir -p helm-charts
- helm package $OSDU_GCP_HELM_PACKAGE_CHARTS --destination helm-charts
- helm repo index --url "${CI_SERVER_URL}/${CI_PROJECT_PATH}/-/jobs/${CI_JOB_ID}/artifacts/raw" .
- mv index.yaml helm-charts
only:
variables:
- $GCP == 'true'
- $OSDU_GCP == 'true'
- $OSDU_GCP_HELM_PACKAGE_CHARTS
changes:
- devops/**/*
- app/sdms/**/*
refs:
- branches
- main
- merge_requests
.common: &common
- gcloud auth activate-service-account --key-file $OSDU_GCP_DEPLOY_FILE
......
Markdown is supported
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