mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-23 14:41:31 +02:00
Merge pull request #330 from flatcar-linux/kai/gce-gvnic
ci-automation/vendor-testing/gce.sh: Test GVNIC and break retest cycle
This commit is contained in:
commit
9fa7449f06
@ -18,14 +18,12 @@ if [[ "${CIA_ARCH}" == "arm64" ]]; then
|
|||||||
echo " ---" >> "${CIA_TAPFILE}"
|
echo " ---" >> "${CIA_TAPFILE}"
|
||||||
echo " ERROR: ARM64 tests not supported on GCE." | tee -a "${CIA_TAPFILE}"
|
echo " ERROR: ARM64 tests not supported on GCE." | tee -a "${CIA_TAPFILE}"
|
||||||
echo " ..." >> "${CIA_TAPFILE}"
|
echo " ..." >> "${CIA_TAPFILE}"
|
||||||
|
break_retest_cycle
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Create temp file and delete it immediately
|
GCP_JSON_KEY_PATH=''
|
||||||
echo "${GCP_JSON_KEY}" | base64 --decode > /tmp/gcp_auth
|
secret_to_file GCP_JSON_KEY_PATH "${GCP_JSON_KEY}"
|
||||||
exec {gcp_auth}</tmp/gcp_auth
|
|
||||||
rm /tmp/gcp_auth
|
|
||||||
GCP_JSON_KEY_PATH="/proc/$$/fd/${gcp_auth}"
|
|
||||||
|
|
||||||
copy_from_buildcache "images/${CIA_ARCH}/${CIA_VERNUM}/${GCE_IMAGE_NAME}" .
|
copy_from_buildcache "images/${CIA_ARCH}/${CIA_VERNUM}/${GCE_IMAGE_NAME}" .
|
||||||
gcloud auth activate-service-account --key-file "${GCP_JSON_KEY_PATH}"
|
gcloud auth activate-service-account --key-file "${GCP_JSON_KEY_PATH}"
|
||||||
@ -46,19 +44,39 @@ trap 'ore gcloud delete-images \
|
|||||||
--json-key="${GCP_JSON_KEY_PATH}" \
|
--json-key="${GCP_JSON_KEY_PATH}" \
|
||||||
"${image_name}" ; gsutil rm -r "${GCE_GCS_IMAGE_UPLOAD}/${CIA_ARCH}-usr/${CIA_VERNUM}" || true' EXIT
|
"${image_name}" ; gsutil rm -r "${GCE_GCS_IMAGE_UPLOAD}/${CIA_ARCH}-usr/${CIA_VERNUM}" || true' EXIT
|
||||||
|
|
||||||
set -x
|
run_kola_tests() {
|
||||||
|
local instance_type="${1}"; shift
|
||||||
timeout --signal=SIGQUIT 6h \
|
local instance_tapfile="${1}"; shift
|
||||||
|
local extra_arg=()
|
||||||
|
if [ "${instance_type}" = "gvnic" ]; then
|
||||||
|
extra_arg+=("--gce-gvnic")
|
||||||
|
fi
|
||||||
|
timeout --signal=SIGQUIT 6h \
|
||||||
kola run \
|
kola run \
|
||||||
--basename="${image_name}" \
|
--basename="${image_name}" \
|
||||||
--gce-image="${image_name}" \
|
--gce-image="${image_name}" \
|
||||||
--gce-json-key="${GCP_JSON_KEY_PATH}" \
|
--gce-json-key="${GCP_JSON_KEY_PATH}" \
|
||||||
--gce-machinetype="${GCE_MACHINE_TYPE}" \
|
--gce-machinetype="${GCE_MACHINE_TYPE}" \
|
||||||
--parallel="${GCE_PARALLEL}" \
|
"${extra_arg[@]}" \
|
||||||
--platform=gce \
|
--parallel="${GCE_PARALLEL}" \
|
||||||
--channel="${CIA_CHANNEL}" \
|
--platform=gce \
|
||||||
--tapfile="${CIA_TAPFILE}" \
|
--channel="${CIA_CHANNEL}" \
|
||||||
--torcx-manifest="${CIA_TORCX_MANIFEST}" \
|
--tapfile="${instance_tapfile}" \
|
||||||
"${@}"
|
--torcx-manifest="${CIA_TORCX_MANIFEST}" \
|
||||||
|
"${@}"
|
||||||
|
}
|
||||||
|
|
||||||
set +x
|
query_kola_tests() {
|
||||||
|
shift; # ignore the instance type
|
||||||
|
kola list --platform=gce --filter "${@}"
|
||||||
|
}
|
||||||
|
|
||||||
|
run_kola_tests_on_instances \
|
||||||
|
"default" \
|
||||||
|
"${CIA_TAPFILE}" \
|
||||||
|
"${CIA_FIRST_RUN}" \
|
||||||
|
"gvnic" \
|
||||||
|
'--' \
|
||||||
|
'cl.internet' \
|
||||||
|
'--' \
|
||||||
|
"${@}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user