Skip to content

Commit 863d682

Browse files
committed
Merge branch 'ci/use-new-bucket' into 'master'
ci: use new minio server See merge request espressif/esp-idf!41894
2 parents a4c03ce + a2db7b5 commit 863d682

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

.gitlab/ci/common.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@ variables:
121121
# add extra python packages
122122
export PYTHONPATH="$IDF_PATH/tools:$IDF_PATH/tools/ci:$IDF_PATH/tools/esp_app_trace:$IDF_PATH/components/partition_table:$IDF_PATH/tools/ci/python_packages:$PYTHONPATH"
123123

124+
# minio configuration
125+
# added here since the precedence of variables in gitlab-ci.yml is lower than project settings
126+
export IDF_S3_SERVER="$IDF_S3_NEW_SERVER"
127+
export IDF_S3_ACCESS_KEY="$IDF_S3_NEW_ACCESS_KEY"
128+
124129
.setup_tools_and_idf_python_venv: &setup_tools_and_idf_python_venv |
125130
# must use after setup_tools_except_target_test
126131
# otherwise the export.sh won't work properly

.gitlab/ci/integration_test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ child_integration_test_pipeline:
6060
stage: assign_test
6161
needs:
6262
- gen_integration_pipeline
63+
variables:
64+
IDF_S3_SERVER: $IDF_S3_NEW_SERVER
65+
IDF_S3_ACCESS_KEY: $IDF_S3_NEW_ACCESS_KEY
6366
trigger:
6467
include:
6568
- artifact: idf-integration-ci/child_pipeline/pipeline.yml

0 commit comments

Comments
 (0)