File tree Expand file tree Collapse file tree 3 files changed +13
-8
lines changed Expand file tree Collapse file tree 3 files changed +13
-8
lines changed Original file line number Diff line number Diff line change @@ -49,7 +49,7 @@ variables:
49
49
- RELEASE_INITIAL_VERSION
50
50
- RELEASE_INITIAL_COMMIT_SHA
51
51
- RELEASE_OPERATOR_VERSION
52
- - BUILD_SCENARIO
52
+ - build_scenario
53
53
54
54
functions :
55
55
@@ -559,27 +559,31 @@ functions:
559
559
560
560
pipeline :
561
561
- *switch_context
562
- - command : subprocess .exec
562
+ - command : shell .exec
563
563
retry_on_failure : true
564
564
type : setup
565
565
params :
566
566
shell : bash
567
567
<< : *e2e_include_expansions_in_env
568
568
working_dir : src/github.com/mongodb/mongodb-kubernetes
569
- binary : scripts/dev/run_python.sh scripts/release/pipeline_main.py ${image_name} --build-scenario ${build_scenario|*BUILD_SCENARIO} --parallel ${all_agents}
569
+ script : |
570
+ source .generated/context.export.env
571
+ scripts/dev/run_python.sh scripts/release/pipeline_main.py ${image_name} --build-scenario $BUILD_SCENARIO --parallel ${all_agents}
570
572
571
573
# TODO: this function is very similar to pipeline and it will joined with it in the future
572
574
release_operator_pipeline :
573
575
- *switch_context
574
- - command : subprocess .exec
576
+ - command : shell .exec
575
577
retry_on_failure : true
576
578
type : setup
577
579
params :
578
580
shell : bash
579
581
<< : *e2e_include_expansions_in_env
580
582
working_dir : src/github.com/mongodb/mongodb-kubernetes
581
583
# By default, use the git tag that triggered the task which can be overridden with RELEASE_OPERATOR_VERSION
582
- binary : scripts/dev/run_python.sh scripts/release/pipeline_main.py ${image_name} --build-scenario release --version ${RELEASE_OPERATOR_VERSION|*triggered_by_git_tag}
584
+ script : |
585
+ source .generated/context.export.env
586
+ scripts/dev/run_python.sh scripts/release/pipeline_main.py ${image_name} --build-scenario release --version ${RELEASE_OPERATOR_VERSION|*triggered_by_git_tag}
583
587
584
588
teardown_cloud_qa_all :
585
589
- *switch_context
Original file line number Diff line number Diff line change @@ -215,7 +215,6 @@ parameters:
215
215
value : " false"
216
216
description : set this to true if you would like the pipeline to automatically push a branch with updated snippets outputs
217
217
218
-
219
218
# Triggered manually or by PCT.
220
219
patch_aliases :
221
220
- alias : " periodic_builds"
@@ -307,7 +306,6 @@ tasks:
307
306
- func : pipeline
308
307
vars :
309
308
image_name : agent
310
- # TODO: make sure this works and is not overridden by evg_private_context (it should not be)
311
309
build_scenario : manual_release
312
310
313
311
- name : migrate_all_agents
Original file line number Diff line number Diff line change @@ -103,7 +103,10 @@ export MDB_UPDATE_LICENSES=true
103
103
BUILD_SCENARIO_RELEASE=" release" # Official release triggered by a git tag
104
104
BUILD_SCENARIO_STAGING=" staging" # CI build from a merge to the master
105
105
BUILD_SCENARIO_PATCH=" patch" # CI build for a patch/pull request
106
- if [ -n " ${BUILD_SCENARIO-} " ]; then
106
+ if [ -n " ${build_scenario-} " ]; then
107
+ echo " Build scenario has been set via pipeline function param, not overriding it"
108
+ export BUILD_SCENARIO=" ${build_scenario} "
109
+ elif [ -n " ${BUILD_SCENARIO-} " ]; then
107
110
echo " Build scenario has been set externally, not overriding it"
108
111
elif [ " ${GIT_TAG} " ]; then
109
112
export BUILD_SCENARIO=$BUILD_SCENARIO_RELEASE
You can’t perform that action at this time.
0 commit comments