Skip to content

Commit 8af5928

Browse files
committed
ecs pipeline changes -vars
1 parent ea40a53 commit 8af5928

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

ansible/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ create-build-env-vars: guard-build_label guard-out_dir
4545
deploy-ecs-proxies: guard-account guard-build_label guard-service_id guard-APIGEE_ENVIRONMENT guard-PROXY_VARS_FILE
4646
@poetry run ansible-playbook -i local deploy-ecs-proxies.yml
4747

48-
deploy-ecs-proxies-retag: guard-build_label guard-service_id guard-CONTAINER_VARS_FILE
48+
deploy-ecs-proxies-retag: guard-build_label guard-service_id guard-PROXY_VARS_FILE
4949
@poetry run ansible-playbook -i local deploy-ecs-proxies-retag.yml
5050

5151
deploy-apigee-proxy: guard-FULLY_QUALIFIED_SERVICE_NAME guard-SERVICE_BASE_PATH guard-APIGEE_ENVIRONMENT guard-APIGEE_ORGANIZATION guard-APIGEE_ACCESS_TOKEN guard-PROXY_DIR guard-PING

ansible/deploy-ecs-proxies-retag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
pre_tasks:
77
- name: include container vars
88
include_vars:
9-
file: "{{ lookup('env', 'CONTAINER_VARS_FILE') | expandvars | expanduser | realpath }}"
9+
file: "{{ lookup('env', 'PROXY_VARS_FILE') | expandvars | expanduser | realpath }}"
1010

1111
roles:
1212
- setup-facts

azure/templates/deploy-service.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,16 @@ steps:
194194
- bash: |
195195
set -e
196196
197+
proxy_vars_file="$(PROXY_VARS_FILE)"
197198
source $(SERVICE_DIR)/.build_env_vars
198199
199200
export ASSUMED_VERSION=$(echo $SERVICE_ARTIFACT_NAME | grep -E -o "v[0-9]+\.[0-9]+\.[0-9]+-?[a-z]*" || true | tail -1)
200201
export DEPLOYED_VERSION=${ASSUMED_VERSION:-${{ parameters.fully_qualified_service_name }}}
202+
203+
PROXY_VARS_FILE="${proxy_vars_file}" \
204+
SOURCE_COMMIT_ID="$(Build.SourceVersion)" \
205+
RELEASE_RELEASEID="$(Build.BuildId)" \
206+
201207
202208
make --no-print-directory -C $(UTILS_DIR)/ansible deploy-ecs-proxies-retag
203209

0 commit comments

Comments
 (0)