Commit 013302bf authored by Daniel Scholl's avatar Daniel Scholl
Browse files

Bug Fix pipelines

parent 3101712e
......@@ -62,7 +62,7 @@ variables:
- group: 'Infrastructure Pipeline Variables'
stages:
- template: devops/infra-prepare-stage.yml
- template: /devops/infra-prepare-stage.yml
parameters:
environments:
- name: 'demo'
......@@ -72,5 +72,5 @@ stages:
configurations:
- jobName: central_resources
terraformWorkspacePrefix: cr
terraformTemplatePath: infra/templates/osdu-r3-mvp/central_resources
terraformTemplatePath: /infra/templates/osdu-r3-mvp/central_resources
deploymentTimeoutInMinutes: 120
......@@ -40,26 +40,12 @@ trigger:
- master
paths:
include:
- /devops/infrastructure/*
- /infra/modules/providers/*
- /infra/templates/osdu-r3-mvp/data_partition/*
- /test-harness/terratest-extensions/*
exclude:
- /**/*.md
pr:
autoCancel: true
branches:
include:
- '*'
paths:
include:
- /devops/infrastructure/*
- /infra/modules/providers/*
- /infra/templates/osdu-r3-mvp/data_partition/*
- /test-harness/terratest-extensions/*
exclude:
- /**/*.md
variables:
- name: 'TF_VERSION'
......@@ -69,13 +55,13 @@ variables:
- name: 'TF_ROOT_DIR'
value: 'infra'
- name: 'PIPELINE_ROOT_DIR'
value: 'devops/infrastructure'
value: 'devops'
- name: 'TEST_HARNESS_DIR'
value: 'test-harness'
- group: 'Infrastructure Pipeline Variables'
stages:
- template: devops/infrastructure/prepare-stage.yml
- template: /devops/prepare-stage.yml
parameters:
environments:
- name: 'demo'
......@@ -85,11 +71,11 @@ stages:
configurations:
- jobName: data_partition_1
terraformWorkspacePrefix: dp1
terraformTemplatePath: infra/templates/osdu-r3-mvp/data_partition
terraformTemplatePath: /infra/templates/osdu-r3-mvp/data_partition
deploymentTimeoutInMinutes: 120
dataPartitionName: opendes
- jobName: data_partition_2
terraformWorkspacePrefix: dp2
terraformTemplatePath: infra/templates/osdu-r3-mvp/data_partition
terraformTemplatePath: /infra/templates/osdu-r3-mvp/data_partition
deploymentTimeoutInMinutes: 120
dataPartitionName: common
......@@ -39,26 +39,12 @@ trigger:
- master
paths:
include:
- /devops/infrastructure/*
- /infra/modules/providers/*
- /infra/templates/osdu-r3-mvp/service_resources/*
- /test-harness/terratest-extensions/*
exclude:
- /**/*.md
pr:
autoCancel: true
branches:
include:
- '*'
paths:
include:
- /devops/infrastructure/*
- /infra/modules/providers/*
- /infra/templates/osdu-r3-mvp/service_resources/*
- /test-harness/terratest-extensions/*
exclude:
- /**/*.md
variables:
- name: 'TF_VERSION'
......@@ -68,13 +54,13 @@ variables:
- name: 'TF_ROOT_DIR'
value: 'infra'
- name: 'PIPELINE_ROOT_DIR'
value: 'devops/infrastructure'
value: 'devops'
- name: 'TEST_HARNESS_DIR'
value: 'test-harness'
- group: 'Infrastructure Pipeline Variables'
stages:
- template: devops/infrastructure/prepare-stage.yml
- template: /devops/prepare-stage.yml
parameters:
environments:
- name: 'demo'
......@@ -84,5 +70,5 @@ stages:
configurations:
- jobName: service_resources
terraformWorkspacePrefix: sr
terraformTemplatePath: infra/templates/osdu-r3-mvp/service_resources
terraformTemplatePath: /infra/templates/osdu-r3-mvp/service_resources
deploymentTimeoutInMinutes: 120
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