diff --git a/docs/service-automation.md b/docs/service-automation.md index dd23a1841a548afd80e58e4ea2fd25a8a6ef629b..4d4f44a276731cf56b61076631d00d6339d6b88a 100644 --- a/docs/service-automation.md +++ b/docs/service-automation.md @@ -373,6 +373,23 @@ az pipelines variable-group create \ -ojson ``` +__Setup and Configure the ADO Library `Azure Service Release - crs-conversion-service`__ + +This variable group is the service specific variables necessary for testing and deploying the `crs-conversion-service` service. + +| Variable | Value | +|----------|-------| +| MAVEN_DEPLOY_POM_FILE_PATH | `drop/provider/crs-converter-azure/crs-converter-aks` | + +```bash +az pipelines variable-group create \ + --name "Azure Service Release - crs-conversion-service" \ + --authorize true \ + --variables \ + MAVEN_DEPLOY_POM_FILE_PATH="drop/provider/crs-converter-azure/crs-converter-aks" \ + -ojson +``` + __Create the Chart Pipelines__ Create the pipelines and run things in this exact order. @@ -610,3 +627,19 @@ az pipelines create \ --yaml-path /devops/azure/pipeline.yml \ -ojson ``` + +11. Add a Pipeline for __crs-conversion-service__ to deploy the Crs Conversion Service. + + _Repo:_ `crs-conversion-service` + _Path:_ `/devops/azure/pipeline.yml` + _Validate:_ https:///api/crs/converter/swagger-ui.html is alive. + +```bash +az pipelines create \ + --name 'crs-conversion-service' \ + --repository crs-conversion-service \ + --branch master \ + --repository-type tfsgit \ + --yaml-path /devops/azure/pipeline.yml \ + -ojson +``` diff --git a/tools/variables/crs-conversion-service.sh b/tools/variables/crs-conversion-service.sh index f0bb2c4d08f2ab54bb7c70396c92f276671e2212..660ab642bbd4aff9f8c43ecdd1a75139264b439c 100644 --- a/tools/variables/crs-conversion-service.sh +++ b/tools/variables/crs-conversion-service.sh @@ -50,7 +50,7 @@ if [ ! -d $UNIQUE ]; then mkdir $UNIQUE; fi # LocalHost Run Settings # ------------------------------------------------------------------------------------------------------ ENTITLEMENTS_URL="https://${ENV_HOST}/entitlements/v1" -SIS_DATA=${SRC_ROOT_DIR}/apachesis_setup/SIS_DATA +SIS_DATA=${SRC_DIR}/apachesis_setup/SIS_DATA azure_istioauth_enabled="true" # ------------------------------------------------------------------------------------------------------ @@ -58,7 +58,7 @@ azure_istioauth_enabled="true" # ------------------------------------------------------------------------------------------------------ INTEGRATION_TESTER="${ENV_PRINCIPAL_ID}" TESTER_SERVICEPRINCIPAL_SECRET="${ENV_PRINCIPAL_SECRET}" -AZURE_AD_TENANT_ID="${TENANT_ID}" +AZURE_TENANT_ID="${TENANT_ID}" AZURE_AD_APP_RESOURCE_ID="${ENV_APP_ID}" BASE_URL=/api/crs/converter/v2 VIRTUAL_SERVICE_HOST_NAME="localhost:8080" @@ -114,13 +114,12 @@ export ENV_ELASTIC_HOST=$ENV_ELASTIC_HOST export ENV_ELASTIC_PORT=$ENV_ELASTIC_PORT export ENV_ELASTIC_USERNAME=$ENV_ELASTIC_USERNAME export ENV_ELASTIC_PASSWORD=$ENV_ELASTIC_PASSWORD -export SRC_ROOT_DIR=$SRC_ROOT_DIR # ------------------------------------------------------------------------------------------------------ # LocalHost Run Settings # ------------------------------------------------------------------------------------------------------ export ENTITLEMENTS_URL="https://${ENV_HOST}/entitlements/v1" -export SIS_DATA=${SRC_ROOT_DIR}/apachesis_setup/SIS_DATA +export SIS_DATA=${SRC_DIR}/apachesis_setup/SIS_DATA export azure_istioauth_enabled="true" # ------------------------------------------------------------------------------------------------------ @@ -128,7 +127,7 @@ export azure_istioauth_enabled="true" # ------------------------------------------------------------------------------------------------------ export INTEGRATION_TESTER="${INTEGRATION_TESTER}" export TESTER_SERVICEPRINCIPAL_SECRET="${TESTER_SERVICEPRINCIPAL_SECRET}" -export AZURE_AD_TENANT_ID="${AZURE_AD_TENANT_ID}" +export AZURE_TENANT_ID="${AZURE_TENANT_ID}" export AZURE_AD_APP_RESOURCE_ID="${AZURE_AD_APP_RESOURCE_ID}" export BASE_URL=/api/crs/converter/v2 export VIRTUAL_SERVICE_HOST_NAME="localhost:8080" @@ -148,7 +147,7 @@ LOCALRUN cat > ${UNIQUE}/${SERVICE}_local_test.yaml < ${UNIQUE}/${SERVICE}_test.yaml <