mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-22 14:11:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #220 from flatcar-linux/tormath1/em-metro

Browse Source 
equinixmetal: use metro instead of facility
This commit is contained in:
Mathieu Tortuyaux 2022-01-26 16:27:09 +01:00 committed by GitHub
commit 98d964d689
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins/kola/packet.sh
View File

@ -42,7 +42,7 @@ fi
# In addition, we override `timeout` to 10 hours, because it takes more than 8 hours # In addition, we override `timeout` to 10 hours, because it takes more than 8 hours
# to run all tests only with 2 tests in parallel. # to run all tests only with 2 tests in parallel.
if [[ "${BOARD}" == "arm64-usr" ]]; then if [[ "${BOARD}" == "arm64-usr" ]]; then
PACKET_REGION="da11" PACKET_REGION="DA"
PARALLEL_TESTS="2" PARALLEL_TESTS="2"
timeout=10h timeout=10h
fi fi
@ -58,13 +58,13 @@ if [[ "${BOARD}" == "amd64-usr" ]] && [[ "${cl_internet_included}" != "" ]]; th
--channel="${GROUP}" \ --channel="${GROUP}" \
--gce-json-key="${UPLOAD_CREDS}" \ --gce-json-key="${UPLOAD_CREDS}" \
--packet-api-key="${PACKET_API_KEY}" \ --packet-api-key="${PACKET_API_KEY}" \
--packet-facility="${PACKET_REGION}" \
--packet-image-url="${IMAGE_URL}" \ --packet-image-url="${IMAGE_URL}" \
--packet-installer-image-kernel-url="${KERNEL_URL}" \ --packet-installer-image-kernel-url="${KERNEL_URL}" \
--packet-installer-image-cpio-url="${CPIO_URL}" \ --packet-installer-image-cpio-url="${CPIO_URL}" \
--packet-project="${PACKET_PROJECT}" \ --packet-project="${PACKET_PROJECT}" \
--packet-storage-url="${UPLOAD_ROOT}/mantle/packet" \ --packet-storage-url="${UPLOAD_ROOT}/mantle/packet" \
--packet-plan="${INSTANCE}" \ --packet-plan="${INSTANCE}" \
--equinixmetal-metro="${PACKET_REGION}" \
--parallel="${PARALLEL_TESTS}" \ --parallel="${PARALLEL_TESTS}" \
--platform=packet \ --platform=packet \
--tapfile="${JOB_NAME##*/}_validate_${INSTANCE}.tap" \ --tapfile="${JOB_NAME##*/}_validate_${INSTANCE}.tap" \
@ -85,13 +85,13 @@ timeout --signal=SIGQUIT "${timeout}" bin/kola run \
--channel="${GROUP}" \ --channel="${GROUP}" \
--gce-json-key="${UPLOAD_CREDS}" \ --gce-json-key="${UPLOAD_CREDS}" \
--packet-api-key="${PACKET_API_KEY}" \ --packet-api-key="${PACKET_API_KEY}" \
--packet-facility="${PACKET_REGION}" \
--packet-image-url="${IMAGE_URL}" \ --packet-image-url="${IMAGE_URL}" \
--packet-installer-image-kernel-url="${KERNEL_URL}" \ --packet-installer-image-kernel-url="${KERNEL_URL}" \
--packet-installer-image-cpio-url="${CPIO_URL}" \ --packet-installer-image-cpio-url="${CPIO_URL}" \
--packet-project="${PACKET_PROJECT}" \ --packet-project="${PACKET_PROJECT}" \
--packet-storage-url="${UPLOAD_ROOT}/mantle/packet" \ --packet-storage-url="${UPLOAD_ROOT}/mantle/packet" \
--packet-plan="${PACKET_MACHINE_TYPE}" \ --packet-plan="${PACKET_MACHINE_TYPE}" \
--equinixmetal-metro="${PACKET_REGION}" \
--parallel="${PARALLEL_TESTS}" \ --parallel="${PARALLEL_TESTS}" \
--platform=packet \ --platform=packet \
--tapfile="${JOB_NAME##*/}.tap" \ --tapfile="${JOB_NAME##*/}.tap" \