From 693e307f726916ca1653106492a110baf2a56754 Mon Sep 17 00:00:00 2001 From: Zvonko Kaiser Date: Fri, 10 May 2024 08:27:42 +0000 Subject: [PATCH] deploy: Add artefact repository New env var so everyone can test the PUSH_TO_REGISTRY feature export PUSH_TO_REGISTRY=yes export ARTEFACT_REGISTRY=quay.io export ARTEFACT_REPOSITORY=my-fancy-kata-containers export ARTEFACT_REGISTRY_USERNAME=zvonkok export ARTEFACT_REGISTRY_PASSWORD= make ...-tarball Signed-off-by: Zvonko Kaiser --- .../local-build/kata-deploy-binaries-in-docker.sh | 2 ++ .../kata-deploy/local-build/kata-deploy-binaries.sh | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh index 191f1cdee9..56864457e3 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh @@ -80,6 +80,7 @@ docker build -q -t build-kata-deploy \ CI="${CI:-}" ARTEFACT_REGISTRY="${ARTEFACT_REGISTRY:-}" +ARTEFACT_REPOSITORY="${ARTEFACT_REPOSITORY:-}" ARTEFACT_REGISTRY_USERNAME="${ARTEFACT_REGISTRY_USERNAME:-}" ARTEFACT_REGISTRY_PASSWORD="${ARTEFACT_REGISTRY_PASSWORD:-}" TARGET_BRANCH="${TARGET_BRANCH:-}" @@ -107,6 +108,7 @@ docker run \ --env CI="${CI}" \ --env USER=${USER} \ --env ARTEFACT_REGISTRY="${ARTEFACT_REGISTRY}" \ + --env ARTEFACT_REPOSITORY="${ARTEFACT_REPOSITORY}" \ --env ARTEFACT_REGISTRY_USERNAME="${ARTEFACT_REGISTRY_USERNAME}" \ --env ARTEFACT_REGISTRY_PASSWORD="${ARTEFACT_REGISTRY_PASSWORD}" \ --env TARGET_BRANCH="${TARGET_BRANCH}" \ diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index aedd29980c..7458be2b7f 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -44,6 +44,7 @@ MEASURED_ROOTFS=${MEASURED_ROOTFS:-no} PULL_TYPE=${PULL_TYPE:-default} USE_CACHE="${USE_CACHE:-"yes"}" ARTEFACT_REGISTRY="${ARTEFACT_REGISTRY:-ghcr.io}" +ARTEFACT_REPOSITORY="${ARTEFACT_REPOSITORY:-kata-containers}" ARTEFACT_REGISTRY_USERNAME="${ARTEFACT_REGISTRY_USERNAME:-}" ARTEFACT_REGISTRY_PASSWORD="${ARTEFACT_REGISTRY_PASSWORD:-}" TARGET_BRANCH="${TARGET_BRANCH:-main}" @@ -194,7 +195,7 @@ install_cached_tarball_component() { # "tarball1_name:tarball1_path tarball2_name:tarball2_path ... tarballN_name:tarballN_path" local extra_tarballs="${6:-}" - sudo oras pull ${ARTEFACT_REGISTRY}/kata-containers/cached-artefacts/${build_target}:latest-${TARGET_BRANCH}-$(uname -m) || return 1 + sudo oras pull ${ARTEFACT_REGISTRY}/${ARTEFACT_REPOSITORY}/cached-artefacts/${build_target}:latest-${TARGET_BRANCH}-$(uname -m) || return 1 cached_version="$(cat ${component}-version)" cached_image_version="$(cat ${component}-builder-image-version)" @@ -1078,10 +1079,11 @@ handle_build() { if [ "${PUSH_TO_REGISTRY}" = "yes" ]; then if [ -z "${ARTEFACT_REGISTRY}" ] || + [ -z "${ARTEFACT_REPOSITORY}" ] || [ -z "${ARTEFACT_REGISTRY_USERNAME}" ] || [ -z "${ARTEFACT_REGISTRY_PASSWORD}" ] || [ -z "${TARGET_BRANCH}" ]; then - die "ARTEFACT_REGISTRY, ARTEFACT_REGISTRY_USERNAME, ARTEFACT_REGISTRY_PASSWORD and TARGET_BRANCH must be passed to the script when pushing the artefacts to the registry!" + die "ARTEFACT_REGISTRY, ARTEFACT_REPOSITORY, ARTEFACT_REGISTRY_USERNAME, ARTEFACT_REGISTRY_PASSWORD and TARGET_BRANCH must be passed to the script when pushing the artefacts to the registry!" fi echo "${ARTEFACT_REGISTRY_PASSWORD}" | sudo oras login "${ARTEFACT_REGISTRY}" -u "${ARTEFACT_REGISTRY_USERNAME}" --password-stdin @@ -1098,7 +1100,7 @@ handle_build() { ;; kernel-nvidia-gpu-confidential) sudo oras push \ - ${ARTEFACT_REGISTRY}/kata-containers/cached-artefacts/${build_target}:latest-${TARGET_BRANCH}-$(uname -m) \ + ${ARTEFACT_REGISTRY}/${ARTEFACT_REPOSITORY}/cached-artefacts/${build_target}:latest-${TARGET_BRANCH}-$(uname -m) \ ${final_tarball_name} \ "kata-static-${build_target}-modules.tar.xz" \ "kata-static-${build_target}-headers.tar.xz" \ @@ -1108,7 +1110,7 @@ handle_build() { ;; kernel*-confidential) sudo oras push \ - ${ARTEFACT_REGISTRY}/kata-containers/cached-artefacts/${build_target}:latest-${TARGET_BRANCH}-$(uname -m) \ + ${ARTEFACT_REGISTRY}/${ARTEFACT_REPOSITORY}/cached-artefacts/${build_target}:latest-${TARGET_BRANCH}-$(uname -m) \ ${final_tarball_name} \ "kata-static-${build_target}-modules.tar.xz" \ ${build_target}-version \ @@ -1117,7 +1119,7 @@ handle_build() { ;; *) sudo oras push \ - ${ARTEFACT_REGISTRY}/kata-containers/cached-artefacts/${build_target}:latest-${TARGET_BRANCH}-$(uname -m) \ + ${ARTEFACT_REGISTRY}/${ARTEFACT_REPOSITORY}/cached-artefacts/${build_target}:latest-${TARGET_BRANCH}-$(uname -m) \ ${final_tarball_name} \ ${build_target}-version \ ${build_target}-builder-image-version \