This commit is contained in:
Sayan Chowdhury 2023-07-20 22:06:36 +05:30
parent 570169a928
commit adaf9f3c13
No known key found for this signature in database
GPG Key ID: B02399319CD05C8B
3 changed files with 16 additions and 17 deletions

View File

@ -188,9 +188,9 @@ function ensure-flatcar-staging-sig-image-version-from-vhd() {
RESOURCE_GROUP_NAME="${STAGING_SIG_RESOURCE_GROUP}"
# shellcheck disable=SC2310 # This might return 1.
if sig-image-version-exists; then
return
fi
#if sig-image-version-exists; then
#return
#fi
ensure-resource-group
ensure-sig

View File

@ -75,8 +75,12 @@ function _inside_capi_image_build() {
echo "== Building Flatcar SIG images from VHDs"
ci-automation/azure-sig.sh azure_login
ci-automation/azure-sig.sh ensure-flatcar-staging-sig-image-version-from-vhd
# echo "== Building Flatcar CAPI SIG image"
# ci-automation/azure-sig.sh build-capi-staging-image
for K8S_VERSION in $K8S_VERSIONS
do
export KUBERNETES_SEMVER="v${K8S_VERSION}"
echo "== Building Flatcar CAPI SIG image"
ci-automation/azure-sig.sh build-capi-staging-image
done
)
}
@ -107,15 +111,10 @@ function _capi_image_build_impl() {
do
setup_capi_params
echo "==== $K8S_VERSIONS"
for K8S_VERSION in $K8S_VERSIONS
do
touch sdk_container/.env # This file should already contain the required credentials as env vars
echo "export KUBERNETES_SEMVER='v${K8S_VERSION}'" >> sdk_container/.env
docker run --pull always --rm --name="${container_name}" --net host \
-w /work -v "$PWD":/work "${mantle_ref}" bash -c "git config --global --add safe.directory /work && source ci-automation/capi_image.sh && _inside_capi_image_build"
done
touch sdk_container/.env # This file should already contain the required credentials as env vars
echo "export K8S_VERSIONS='${K8S_VERSIONS}'" >> sdk_container/.env
docker run --pull always --rm --name="${container_name}" --net host \
-w /work -v "$PWD":/work "${mantle_ref}" bash -c "git config --global --add safe.directory /work && source ci-automation/capi_image.sh && _inside_capi_image_build"
done
}

View File

@ -1,4 +1,4 @@
FLATCAR_VERSION=3654.0.0+nightly-20230703-2100
FLATCAR_VERSION_ID=3654.0.0
FLATCAR_BUILD_ID="nightly-20230703-2100"
FLATCAR_VERSION=3665.0.0
FLATCAR_VERSION_ID=3665.0.0
FLATCAR_BUILD_ID=""
FLATCAR_SDK_VERSION=3654.0.0+nightly-20230703-2100