From b69614a66cf2d1aa1778bc8d146f1a8ecfedd567 Mon Sep 17 00:00:00 2001 From: Tim McCarthy Date: Fri, 28 Feb 2020 13:54:25 -0500 Subject: [PATCH] Refactored the folders under deploy/aro --- deploy/aro/basket-api/azure-pipelines.yml | 3 +-- .../basketapi-deploy-template.yml | 0 deploy/aro/catalog-api/azure-pipelines.yml | 3 +-- .../catalogapi-deploy-template.yml | 0 deploy/aro/identity-api/azure-pipelines.yml | 3 +-- .../identityapi-deploy-template.yml | 0 deploy/aro/infrastructure/azure-pipelines.yml | 13 ++++++------- .../infrastructure/mongo-db-deploy-template.yml | 0 .../infrastructure/mssql-server-deploy-template.yml | 0 .../infrastructure/rabbitmq-deploy-template.yml | 0 .../infrastructure/redis-deploy-template.yml | 0 .../infrastructure/secrets-deploy-template.yml | 0 .../infrastructure/seq-deploy-template.yml | 0 deploy/aro/locations-api/azure-pipelines.yml | 3 +-- .../locationsapi-deploy-template.yml | 0 deploy/aro/marketing-api/azure-pipelines.yml | 3 +-- .../marketingapi-deploy-template.yml | 0 deploy/aro/mobileshoppingagg/azure-pipelines.yml | 3 +-- .../mobileshoppingagg-deploy-template.yml | 0 deploy/aro/ordering-api/azure-pipelines.yml | 3 +-- .../orderingapi-deploy-template.yml | 0 .../ordering-backgroundtasks/azure-pipelines.yml | 3 +-- .../ordering-backgroundtasks-deploy-template.yml | 0 deploy/aro/ordering-signalrhub/azure-pipelines.yml | 3 +-- .../ordering-signalrhub-deploy-template.yml | 0 deploy/aro/payment-api/azure-pipelines.yml | 3 +-- .../paymentapi-deploy-template.yml | 0 deploy/aro/web-mvc/azure-pipelines.yml | 3 +-- .../webmvc-deploy-template.yml | 0 deploy/aro/web-spa/azure-pipelines.yml | 3 +-- .../webspa-deploy-template.yml | 0 deploy/aro/webhooks-api/azure-pipelines.yml | 3 +-- .../webhooksapi-deploy-template.yml | 0 deploy/aro/webhooks-client/azure-pipelines.yml | 5 ++--- .../webhooks-client-deploy-template.yml | 0 deploy/aro/webshoppingagg/azure-pipelines.yml | 3 +-- .../webshoppingagg-deploy-template.yml | 0 deploy/aro/webstatus/azure-pipelines.yml | 3 +-- .../webstatus-deploy-template.yml | 0 39 files changed, 23 insertions(+), 40 deletions(-) rename deploy/aro/{openshift-templates => basket-api}/basketapi-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => catalog-api}/catalogapi-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => identity-api}/identityapi-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => }/infrastructure/mongo-db-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => }/infrastructure/mssql-server-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => }/infrastructure/rabbitmq-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => }/infrastructure/redis-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => }/infrastructure/secrets-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => }/infrastructure/seq-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => locations-api}/locationsapi-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => marketing-api}/marketingapi-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => mobileshoppingagg}/mobileshoppingagg-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => ordering-api}/orderingapi-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => ordering-backgroundtasks}/ordering-backgroundtasks-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => ordering-signalrhub}/ordering-signalrhub-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => payment-api}/paymentapi-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => web-mvc}/webmvc-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => web-spa}/webspa-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => webhooks-api}/webhooksapi-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => webhooks-client}/webhooks-client-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => webshoppingagg}/webshoppingagg-deploy-template.yml (100%) rename deploy/aro/{openshift-templates => webstatus}/webstatus-deploy-template.yml (100%) diff --git a/deploy/aro/basket-api/azure-pipelines.yml b/deploy/aro/basket-api/azure-pipelines.yml index 78d43d216..45567b8d1 100644 --- a/deploy/aro/basket-api/azure-pipelines.yml +++ b/deploy/aro/basket-api/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: paths: include: - deploy/aro/basket-api/* - - deploy/aro/openshift-templates/* stages: - stage: development displayName: Development @@ -31,6 +30,6 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/basketapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p IDENTITY_URL=$(IdentityApiUrl) -p REDIS_HOSTNAME=$(RedisHostname) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/basket-api/basketapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p IDENTITY_URL=$(IdentityApiUrl) -p REDIS_HOSTNAME=$(RedisHostname) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-' failOnStderr: true displayName: 'Ensure Basket API OpenShift DeploymentConfig and Service' \ No newline at end of file diff --git a/deploy/aro/openshift-templates/basketapi-deploy-template.yml b/deploy/aro/basket-api/basketapi-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/basketapi-deploy-template.yml rename to deploy/aro/basket-api/basketapi-deploy-template.yml diff --git a/deploy/aro/catalog-api/azure-pipelines.yml b/deploy/aro/catalog-api/azure-pipelines.yml index d5328f6dc..b0a3fe335 100644 --- a/deploy/aro/catalog-api/azure-pipelines.yml +++ b/deploy/aro/catalog-api/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: paths: include: - deploy/aro/catalog-api/* - - deploy/aro/openshift-templates/* stages: - stage: development displayName: Development @@ -41,7 +40,7 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/catalogapi-deploy-template.yml + - script: 'oc process -f ./deploy/aro/catalog-api/catalogapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p PIC_BASE_URL=$(PicBaseUrl) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) diff --git a/deploy/aro/openshift-templates/catalogapi-deploy-template.yml b/deploy/aro/catalog-api/catalogapi-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/catalogapi-deploy-template.yml rename to deploy/aro/catalog-api/catalogapi-deploy-template.yml diff --git a/deploy/aro/identity-api/azure-pipelines.yml b/deploy/aro/identity-api/azure-pipelines.yml index 370f09b1a..1f305c059 100644 --- a/deploy/aro/identity-api/azure-pipelines.yml +++ b/deploy/aro/identity-api/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: paths: include: - deploy/aro/identity-api/* - - deploy/aro/openshift-templates/* stages: - stage: development displayName: Development @@ -41,7 +40,7 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/identityapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEB_SPA_URL=$(WebSpaUrl) -p WEB_MVC_URL=$(WebMvcUrl) -p LOCATION_API_URL=$(LocationsApiUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p BASKET_API_URL=$(BasketApiUrl) -p ORDERING_API_URL=$(OrderingApiUrl) -p MOBILE_SHOPPING_AGGREGATOR_URL=$(MobileShoppingAggregatorUrl) -p WEB_SHOPPING_AGGREGATOR_URL=$(WebShoppingAggregatorUrl) -p WEBHOOKS_API_URL=$(WebhooksApiUrl) -p WEBHOOKS_WEB_CLIENT_URL=$(WebhooksWebClientUrl) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/identity-api/identityapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEB_SPA_URL=$(WebSpaUrl) -p WEB_MVC_URL=$(WebMvcUrl) -p LOCATION_API_URL=$(LocationsApiUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p BASKET_API_URL=$(BasketApiUrl) -p ORDERING_API_URL=$(OrderingApiUrl) -p MOBILE_SHOPPING_AGGREGATOR_URL=$(MobileShoppingAggregatorUrl) -p WEB_SHOPPING_AGGREGATOR_URL=$(WebShoppingAggregatorUrl) -p WEBHOOKS_API_URL=$(WebhooksApiUrl) -p WEBHOOKS_WEB_CLIENT_URL=$(WebhooksWebClientUrl) | oc apply -f-' failOnStderr: true displayName: 'Ensure Identity API OpenShift DeploymentConfig and Service' - script: 'oc apply -f ./deploy/aro/identity-api/identity-public-route.json' diff --git a/deploy/aro/openshift-templates/identityapi-deploy-template.yml b/deploy/aro/identity-api/identityapi-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/identityapi-deploy-template.yml rename to deploy/aro/identity-api/identityapi-deploy-template.yml diff --git a/deploy/aro/infrastructure/azure-pipelines.yml b/deploy/aro/infrastructure/azure-pipelines.yml index adaaa3072..a829c53c3 100644 --- a/deploy/aro/infrastructure/azure-pipelines.yml +++ b/deploy/aro/infrastructure/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: paths: include: - deploy/aro/infrastructure/* - - deploy/aro/openshift-templates/infrastructure/* stages: - stage: development displayName: Development @@ -40,21 +39,21 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/infrastructure/secrets-deploy-template.yml -p CATALOG_DB_CONNECTION_SECRET="$(CatalogDbConnection)" -p IDENTITY_DB_CONNECTION_SECRET="$(IdentityDbConnection)" -p MARKETING_DB_CONNECTION_SECRET="$(MarketingDbConnection)" -p ORDERING_DB_CONNECTION_SECRET="$(OrderingDbConnection)" -p SQL_PASSWORD_SECRET=$(SqlPassword) -p WEBHOOKS_DB_CONNECTION_SECRET="$(WebhooksDbConnection)" | oc apply -f-' + - script: 'oc process -f ./deploy/aro/infrastructure/secrets-deploy-template.yml -p CATALOG_DB_CONNECTION_SECRET="$(CatalogDbConnection)" -p IDENTITY_DB_CONNECTION_SECRET="$(IdentityDbConnection)" -p MARKETING_DB_CONNECTION_SECRET="$(MarketingDbConnection)" -p ORDERING_DB_CONNECTION_SECRET="$(OrderingDbConnection)" -p SQL_PASSWORD_SECRET=$(SqlPassword) -p WEBHOOKS_DB_CONNECTION_SECRET="$(WebhooksDbConnection)" | oc apply -f-' failOnStderr: true displayName: 'Secrets Deployment' - - script: 'oc process -f ./deploy/aro/openshift-templates/infrastructure/rabbitmq-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/infrastructure/rabbitmq-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' failOnStderr: true displayName: 'RabbitMQ Deployment' - - script: 'oc process -f ./deploy/aro/openshift-templates/infrastructure/redis-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/infrastructure/redis-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' failOnStderr: true displayName: 'Redis Deployment' - - script: 'oc process -f ./deploy/aro/openshift-templates/infrastructure/seq-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/infrastructure/seq-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' failOnStderr: true displayName: 'Seq Deployment' - - script: 'oc process -f ./deploy/aro/openshift-templates/infrastructure/mssql-server-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/infrastructure/mssql-server-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' failOnStderr: true displayName: 'SQL Server Deployment' - - script: 'oc process -f ./deploy/aro/openshift-templates/infrastructure/mongo-db-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/infrastructure/mongo-db-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' failOnStderr: true displayName: 'MongoDB Deployment' \ No newline at end of file diff --git a/deploy/aro/openshift-templates/infrastructure/mongo-db-deploy-template.yml b/deploy/aro/infrastructure/mongo-db-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/infrastructure/mongo-db-deploy-template.yml rename to deploy/aro/infrastructure/mongo-db-deploy-template.yml diff --git a/deploy/aro/openshift-templates/infrastructure/mssql-server-deploy-template.yml b/deploy/aro/infrastructure/mssql-server-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/infrastructure/mssql-server-deploy-template.yml rename to deploy/aro/infrastructure/mssql-server-deploy-template.yml diff --git a/deploy/aro/openshift-templates/infrastructure/rabbitmq-deploy-template.yml b/deploy/aro/infrastructure/rabbitmq-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/infrastructure/rabbitmq-deploy-template.yml rename to deploy/aro/infrastructure/rabbitmq-deploy-template.yml diff --git a/deploy/aro/openshift-templates/infrastructure/redis-deploy-template.yml b/deploy/aro/infrastructure/redis-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/infrastructure/redis-deploy-template.yml rename to deploy/aro/infrastructure/redis-deploy-template.yml diff --git a/deploy/aro/openshift-templates/infrastructure/secrets-deploy-template.yml b/deploy/aro/infrastructure/secrets-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/infrastructure/secrets-deploy-template.yml rename to deploy/aro/infrastructure/secrets-deploy-template.yml diff --git a/deploy/aro/openshift-templates/infrastructure/seq-deploy-template.yml b/deploy/aro/infrastructure/seq-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/infrastructure/seq-deploy-template.yml rename to deploy/aro/infrastructure/seq-deploy-template.yml diff --git a/deploy/aro/locations-api/azure-pipelines.yml b/deploy/aro/locations-api/azure-pipelines.yml index e724a14f5..2ae69fd67 100644 --- a/deploy/aro/locations-api/azure-pipelines.yml +++ b/deploy/aro/locations-api/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: paths: include: - deploy/aro/locations-api/* - - deploy/aro/openshift-templates/* stages: - stage: development displayName: Development @@ -30,6 +29,6 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/locationsapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p MONGO_DB_CONNECTION_STRING=$(MongoConnectionString) -p LOCATIONS_DB_NAME=$(LocationsDbName) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p IDENTITY_URL=$(IdentityApiUrl) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/locations-api/locationsapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p MONGO_DB_CONNECTION_STRING=$(MongoConnectionString) -p LOCATIONS_DB_NAME=$(LocationsDbName) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p IDENTITY_URL=$(IdentityApiUrl) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-' failOnStderr: true displayName: 'Ensure Locations API OpenShift DeploymentConfig and Service' \ No newline at end of file diff --git a/deploy/aro/openshift-templates/locationsapi-deploy-template.yml b/deploy/aro/locations-api/locationsapi-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/locationsapi-deploy-template.yml rename to deploy/aro/locations-api/locationsapi-deploy-template.yml diff --git a/deploy/aro/marketing-api/azure-pipelines.yml b/deploy/aro/marketing-api/azure-pipelines.yml index acb739865..366a99f46 100644 --- a/deploy/aro/marketing-api/azure-pipelines.yml +++ b/deploy/aro/marketing-api/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: paths: include: - deploy/aro/marketing-api/* - - deploy/aro/openshift-templates/* stages: - stage: development displayName: Development @@ -30,6 +29,6 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/marketingapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p MONGO_DB_CONNECTION_STRING=$(MongoConnectionString) -p MARKETING_DB_NAME=$(MarketingDbName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p IDENTITY_URL=$(IdentityApiUrl) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p PIC_BASE_URL=$(PicBaseUrl) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/marketing-api/marketingapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p MONGO_DB_CONNECTION_STRING=$(MongoConnectionString) -p MARKETING_DB_NAME=$(MarketingDbName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p IDENTITY_URL=$(IdentityApiUrl) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p PIC_BASE_URL=$(PicBaseUrl) | oc apply -f-' failOnStderr: true displayName: 'Ensure Marketing API OpenShift DeploymentConfig and Service' \ No newline at end of file diff --git a/deploy/aro/openshift-templates/marketingapi-deploy-template.yml b/deploy/aro/marketing-api/marketingapi-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/marketingapi-deploy-template.yml rename to deploy/aro/marketing-api/marketingapi-deploy-template.yml diff --git a/deploy/aro/mobileshoppingagg/azure-pipelines.yml b/deploy/aro/mobileshoppingagg/azure-pipelines.yml index c6a8215a2..598d25048 100644 --- a/deploy/aro/mobileshoppingagg/azure-pipelines.yml +++ b/deploy/aro/mobileshoppingagg/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: paths: include: - deploy/aro/mobileshoppingagg/* - - deploy/aro/openshift-templates/* stages: - stage: development displayName: Development @@ -31,6 +30,6 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/mobileshoppingagg-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p BASKET_API_URL=$(BasketApiUrl) -p CATALOG_API_URL=$(CatalogApiUrl) -p ORDERING_API_URL=$(OrderingApiUrl) -p IDENTITY_API_URL=$(IdentityApiUrl) -p BASKET_API_GRPC_URL=$(BasketApiGrpcUrl) -p CATALOG_API_GRPC_URL=$(CatalogApiGrpcUrl) -p ORDERING_API_GRPC_URL=$(OrderingApiGrpcUrl) -p CATALOG_API_HC_URL=$(CatalogApiHc) -p ORDERING_API_HC_URL=$(OrderingApiHc) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p BASKET_API_HC_URL=$(BasketApiHc) -p MARKETING_API_HC_URL=$(MarketingApiHc) -p PAYMENT_API_HC_URL=$(PaymentApiHc) -p LOCATION_API_HC_URL=$(LocationsApiHc) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/mobileshoppingagg/mobileshoppingagg-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p BASKET_API_URL=$(BasketApiUrl) -p CATALOG_API_URL=$(CatalogApiUrl) -p ORDERING_API_URL=$(OrderingApiUrl) -p IDENTITY_API_URL=$(IdentityApiUrl) -p BASKET_API_GRPC_URL=$(BasketApiGrpcUrl) -p CATALOG_API_GRPC_URL=$(CatalogApiGrpcUrl) -p ORDERING_API_GRPC_URL=$(OrderingApiGrpcUrl) -p CATALOG_API_HC_URL=$(CatalogApiHc) -p ORDERING_API_HC_URL=$(OrderingApiHc) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p BASKET_API_HC_URL=$(BasketApiHc) -p MARKETING_API_HC_URL=$(MarketingApiHc) -p PAYMENT_API_HC_URL=$(PaymentApiHc) -p LOCATION_API_HC_URL=$(LocationsApiHc) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) | oc apply -f-' failOnStderr: true displayName: 'Ensure Mobile Shopping Aggregator OpenShift DeploymentConfig and Service' \ No newline at end of file diff --git a/deploy/aro/openshift-templates/mobileshoppingagg-deploy-template.yml b/deploy/aro/mobileshoppingagg/mobileshoppingagg-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/mobileshoppingagg-deploy-template.yml rename to deploy/aro/mobileshoppingagg/mobileshoppingagg-deploy-template.yml diff --git a/deploy/aro/ordering-api/azure-pipelines.yml b/deploy/aro/ordering-api/azure-pipelines.yml index b9fc19713..ea252105f 100644 --- a/deploy/aro/ordering-api/azure-pipelines.yml +++ b/deploy/aro/ordering-api/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: paths: include: - deploy/aro/ordering-api/* - - deploy/aro/openshift-templates/* stages: - stage: development displayName: Development @@ -31,6 +30,6 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/orderingapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p IDENTITY_URL=$(IdentityApiUrl) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/ordering-api/orderingapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p IDENTITY_URL=$(IdentityApiUrl) | oc apply -f-' failOnStderr: true displayName: 'Ensure Ordering API OpenShift DeploymentConfig and Service' \ No newline at end of file diff --git a/deploy/aro/openshift-templates/orderingapi-deploy-template.yml b/deploy/aro/ordering-api/orderingapi-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/orderingapi-deploy-template.yml rename to deploy/aro/ordering-api/orderingapi-deploy-template.yml diff --git a/deploy/aro/ordering-backgroundtasks/azure-pipelines.yml b/deploy/aro/ordering-backgroundtasks/azure-pipelines.yml index 56660602e..36a78cd1f 100644 --- a/deploy/aro/ordering-backgroundtasks/azure-pipelines.yml +++ b/deploy/aro/ordering-backgroundtasks/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: paths: include: - deploy/aro/ordering-backgroundtasks/* - - deploy/aro/openshift-templates/* stages: - stage: development displayName: Development @@ -30,6 +29,6 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/ordering-backgroundtasks-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/ordering-backgroundtasks/ordering-backgroundtasks-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-' failOnStderr: true displayName: 'Ensure Ordering Background Tasks OpenShift DeploymentConfig and Service' \ No newline at end of file diff --git a/deploy/aro/openshift-templates/ordering-backgroundtasks-deploy-template.yml b/deploy/aro/ordering-backgroundtasks/ordering-backgroundtasks-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/ordering-backgroundtasks-deploy-template.yml rename to deploy/aro/ordering-backgroundtasks/ordering-backgroundtasks-deploy-template.yml diff --git a/deploy/aro/ordering-signalrhub/azure-pipelines.yml b/deploy/aro/ordering-signalrhub/azure-pipelines.yml index b27202c01..0f1e73e7b 100644 --- a/deploy/aro/ordering-signalrhub/azure-pipelines.yml +++ b/deploy/aro/ordering-signalrhub/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: paths: include: - deploy/aro/ordering-signalrhub/* - - deploy/aro/openshift-templates/* stages: - stage: development displayName: Development @@ -31,6 +30,6 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/ordering-signalrhub-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p IDENTITY_URL=$(IdentityApiUrl) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/ordering-signalrhub/ordering-signalrhub-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p IDENTITY_URL=$(IdentityApiUrl) | oc apply -f-' failOnStderr: true displayName: 'Ensure Catalog API OpenShift DeploymentConfig and Service' \ No newline at end of file diff --git a/deploy/aro/openshift-templates/ordering-signalrhub-deploy-template.yml b/deploy/aro/ordering-signalrhub/ordering-signalrhub-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/ordering-signalrhub-deploy-template.yml rename to deploy/aro/ordering-signalrhub/ordering-signalrhub-deploy-template.yml diff --git a/deploy/aro/payment-api/azure-pipelines.yml b/deploy/aro/payment-api/azure-pipelines.yml index 8a83cbed1..b9d585d99 100644 --- a/deploy/aro/payment-api/azure-pipelines.yml +++ b/deploy/aro/payment-api/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: paths: include: - deploy/aro/payment-api/* - - deploy/aro/openshift-templates/* stages: - stage: development displayName: Development @@ -30,6 +29,6 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/paymentapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/payment-api/paymentapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-' failOnStderr: true displayName: 'Ensure Payment API OpenShift DeploymentConfig and Service' \ No newline at end of file diff --git a/deploy/aro/openshift-templates/paymentapi-deploy-template.yml b/deploy/aro/payment-api/paymentapi-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/paymentapi-deploy-template.yml rename to deploy/aro/payment-api/paymentapi-deploy-template.yml diff --git a/deploy/aro/web-mvc/azure-pipelines.yml b/deploy/aro/web-mvc/azure-pipelines.yml index 1de4c4401..d0b853bb6 100644 --- a/deploy/aro/web-mvc/azure-pipelines.yml +++ b/deploy/aro/web-mvc/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: paths: include: - deploy/aro/web-mvc/* - - deploy/aro/openshift-templates/* stages: - stage: development displayName: Development @@ -41,7 +40,7 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/webmvc-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p IDENTITY_API_URL=$(IdentityApiUrl) -p WEB_SHOPPING_API_GATEWAY_URL=$(WebShoppingApiGatewayUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p ORDERING_SIGNALR_HUB_URL=$(OrderingSignalRHubUrl) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/web-mvc/webmvc-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p IDENTITY_API_URL=$(IdentityApiUrl) -p WEB_SHOPPING_API_GATEWAY_URL=$(WebShoppingApiGatewayUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p ORDERING_SIGNALR_HUB_URL=$(OrderingSignalRHubUrl) | oc apply -f-' failOnStderr: true displayName: 'Ensure Web MVC OpenShift DeploymentConfig and Service' - script: 'oc apply -f ./deploy/aro/web-mvc/webmvc-public-route.json' diff --git a/deploy/aro/openshift-templates/webmvc-deploy-template.yml b/deploy/aro/web-mvc/webmvc-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/webmvc-deploy-template.yml rename to deploy/aro/web-mvc/webmvc-deploy-template.yml diff --git a/deploy/aro/web-spa/azure-pipelines.yml b/deploy/aro/web-spa/azure-pipelines.yml index 8905110c6..8b340c9d7 100644 --- a/deploy/aro/web-spa/azure-pipelines.yml +++ b/deploy/aro/web-spa/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: paths: include: - deploy/aro/web-spa/* - - deploy/aro/openshift-templates/* stages: - stage: development displayName: Development @@ -31,6 +30,6 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/webspa-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p IDENTITY_API_URL=$(IdentityApiUrl) -p WEB_SHOPPING_API_GATEWAY_URL=$(WebShoppingApiGatewayUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p ORDERING_SIGNALR_HUB_URL=$(OrderingSignalRHubUrl) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/web-spa/webspa-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p IDENTITY_API_URL=$(IdentityApiUrl) -p WEB_SHOPPING_API_GATEWAY_URL=$(WebShoppingApiGatewayUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p ORDERING_SIGNALR_HUB_URL=$(OrderingSignalRHubUrl) | oc apply -f-' failOnStderr: true displayName: 'Ensure Web SPA OpenShift DeploymentConfig and Service' \ No newline at end of file diff --git a/deploy/aro/openshift-templates/webspa-deploy-template.yml b/deploy/aro/web-spa/webspa-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/webspa-deploy-template.yml rename to deploy/aro/web-spa/webspa-deploy-template.yml diff --git a/deploy/aro/webhooks-api/azure-pipelines.yml b/deploy/aro/webhooks-api/azure-pipelines.yml index c2262cf2f..796160e95 100644 --- a/deploy/aro/webhooks-api/azure-pipelines.yml +++ b/deploy/aro/webhooks-api/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: paths: include: - deploy/aro/webhooks-api/* - - deploy/aro/openshift-templates/* stages: - stage: development displayName: Development @@ -30,6 +29,6 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/webhooksapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p IDENTITY_URL=$(IdentityApiUrl) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/webhooks-api/webhooksapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p IDENTITY_URL=$(IdentityApiUrl) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) | oc apply -f-' failOnStderr: true displayName: 'Ensure Webhooks API OpenShift DeploymentConfig and Service' \ No newline at end of file diff --git a/deploy/aro/openshift-templates/webhooksapi-deploy-template.yml b/deploy/aro/webhooks-api/webhooksapi-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/webhooksapi-deploy-template.yml rename to deploy/aro/webhooks-api/webhooksapi-deploy-template.yml diff --git a/deploy/aro/webhooks-client/azure-pipelines.yml b/deploy/aro/webhooks-client/azure-pipelines.yml index dd6bb55bb..9299fd5b7 100644 --- a/deploy/aro/webhooks-client/azure-pipelines.yml +++ b/deploy/aro/webhooks-client/azure-pipelines.yml @@ -7,8 +7,7 @@ trigger: - dev paths: include: - - deploy/aro/web-mvc/* - - deploy/aro/openshift-templates/* + - deploy/aro/webhooks-client/* stages: - stage: development displayName: Development @@ -31,6 +30,6 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/webhooks-client-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEBHOOKS_TOKEN=$(WebhooksToken) -p IDENTITY_API_URL=$(IdentityApiUrl) -p WEBHOOKS_WEB_CLIENT_URL=$(WebhooksWebClientUrl) -p WEBHOOKS_API_URL=$(WebhooksApiUrl) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/webhooks-client/webhooks-client-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEBHOOKS_TOKEN=$(WebhooksToken) -p IDENTITY_API_URL=$(IdentityApiUrl) -p WEBHOOKS_WEB_CLIENT_URL=$(WebhooksWebClientUrl) -p WEBHOOKS_API_URL=$(WebhooksApiUrl) | oc apply -f-' failOnStderr: true displayName: 'Ensure Webhooks Client OpenShift DeploymentConfig and Service' \ No newline at end of file diff --git a/deploy/aro/openshift-templates/webhooks-client-deploy-template.yml b/deploy/aro/webhooks-client/webhooks-client-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/webhooks-client-deploy-template.yml rename to deploy/aro/webhooks-client/webhooks-client-deploy-template.yml diff --git a/deploy/aro/webshoppingagg/azure-pipelines.yml b/deploy/aro/webshoppingagg/azure-pipelines.yml index 9e8bc6ec4..70df1f8da 100644 --- a/deploy/aro/webshoppingagg/azure-pipelines.yml +++ b/deploy/aro/webshoppingagg/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: paths: include: - deploy/aro/webshoppingagg/* - - deploy/aro/openshift-templates/* stages: - stage: development displayName: Development @@ -31,6 +30,6 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/webshoppingagg-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p BASKET_API_URL=$(BasketApiUrl) -p CATALOG_API_URL=$(CatalogApiUrl) -p ORDERING_API_URL=$(OrderingApiUrl) -p IDENTITY_API_URL=$(IdentityApiUrl) -p BASKET_API_GRPC_URL=$(BasketApiGrpcUrl) -p CATALOG_API_GRPC_URL=$(CatalogApiGrpcUrl) -p ORDERING_API_GRPC_URL=$(OrderingApiGrpcUrl) -p CATALOG_API_HC_URL=$(CatalogApiHc) -p ORDERING_API_HC_URL=$(OrderingApiHc) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p BASKET_API_HC_URL=$(BasketApiHc) -p MARKETING_API_HC_URL=$(MarketingApiHc) -p PAYMENT_API_HC_URL=$(PaymentApiHc) -p LOCATION_API_HC_URL=$(LocationsApiHc) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/webshoppingagg/webshoppingagg-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p BASKET_API_URL=$(BasketApiUrl) -p CATALOG_API_URL=$(CatalogApiUrl) -p ORDERING_API_URL=$(OrderingApiUrl) -p IDENTITY_API_URL=$(IdentityApiUrl) -p BASKET_API_GRPC_URL=$(BasketApiGrpcUrl) -p CATALOG_API_GRPC_URL=$(CatalogApiGrpcUrl) -p ORDERING_API_GRPC_URL=$(OrderingApiGrpcUrl) -p CATALOG_API_HC_URL=$(CatalogApiHc) -p ORDERING_API_HC_URL=$(OrderingApiHc) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p BASKET_API_HC_URL=$(BasketApiHc) -p MARKETING_API_HC_URL=$(MarketingApiHc) -p PAYMENT_API_HC_URL=$(PaymentApiHc) -p LOCATION_API_HC_URL=$(LocationsApiHc) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) | oc apply -f-' failOnStderr: true displayName: 'Ensure Web Shopping Aggregator OpenShift DeploymentConfig and Service' \ No newline at end of file diff --git a/deploy/aro/openshift-templates/webshoppingagg-deploy-template.yml b/deploy/aro/webshoppingagg/webshoppingagg-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/webshoppingagg-deploy-template.yml rename to deploy/aro/webshoppingagg/webshoppingagg-deploy-template.yml diff --git a/deploy/aro/webstatus/azure-pipelines.yml b/deploy/aro/webstatus/azure-pipelines.yml index 4d1a368e5..3b8f71855 100644 --- a/deploy/aro/webstatus/azure-pipelines.yml +++ b/deploy/aro/webstatus/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: paths: include: - deploy/aro/webstatus/* - - deploy/aro/openshift-templates/* stages: - stage: development displayName: Development @@ -31,6 +30,6 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/webstatus-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEB_MVC_HC_URL=$(WebMvcHc) -p WEB_SPA_HC_URL=$(WebSpaHc) -p WEB_SHOPPING_AGGREGATOR_HC_URL=$(WebShoppingAggregatorHc) -p MOBILE_SHOPPING_AGGREGATOR_HC_URL=$(MobileShoppingAggregatorHc) -p ORDERING_API_HC_URL=$(OrderingApiHc) -p BASKET_API_HC_URL=$(BasketApiHc) -p CATALOG_API_HC_URL=$(CatalogApiHc) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p MARKETING_API_HC_URL=$(MarketingApiHc) -p LOCATIONS_API_HC_URL=$(LocationsApiHc) -p PAYMENT_API_HC_URL=$(PaymentApiHc) -p ORDERING_SIGNALR_HUB_HC_URL=$(OrderingSignalRHubHc) -p ORDERING_BACKGROUND_TASKS_HC_URL=$(OrderingBackgroundTasksHc) | oc apply -f-' + - script: 'oc process -f ./deploy/aro/webstatus/webstatus-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEB_MVC_HC_URL=$(WebMvcHc) -p WEB_SPA_HC_URL=$(WebSpaHc) -p WEB_SHOPPING_AGGREGATOR_HC_URL=$(WebShoppingAggregatorHc) -p MOBILE_SHOPPING_AGGREGATOR_HC_URL=$(MobileShoppingAggregatorHc) -p ORDERING_API_HC_URL=$(OrderingApiHc) -p BASKET_API_HC_URL=$(BasketApiHc) -p CATALOG_API_HC_URL=$(CatalogApiHc) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p MARKETING_API_HC_URL=$(MarketingApiHc) -p LOCATIONS_API_HC_URL=$(LocationsApiHc) -p PAYMENT_API_HC_URL=$(PaymentApiHc) -p ORDERING_SIGNALR_HUB_HC_URL=$(OrderingSignalRHubHc) -p ORDERING_BACKGROUND_TASKS_HC_URL=$(OrderingBackgroundTasksHc) | oc apply -f-' failOnStderr: true displayName: 'Ensure Web Status OpenShift DeploymentConfig and Service' \ No newline at end of file diff --git a/deploy/aro/openshift-templates/webstatus-deploy-template.yml b/deploy/aro/webstatus/webstatus-deploy-template.yml similarity index 100% rename from deploy/aro/openshift-templates/webstatus-deploy-template.yml rename to deploy/aro/webstatus/webstatus-deploy-template.yml