From d7aa793dde261773be3bcdfd34f4ba562f971b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 15 Jan 2026 17:09:10 +0100 Subject: [PATCH] Revert "ci: Run a nightly job using the kata-deploy rust" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6130d7330f388f7bc178f0670ae21294db208290, as we're officially swithcing to the rust version of kata-deploy. Signed-off-by: Fabiano Fidêncio --- .github/workflows/ci-nightly-rust.yaml | 36 ------------------- .github/workflows/ci.yaml | 23 ++++-------- .github/workflows/payload-after-push.yaml | 4 --- .../publish-kata-deploy-payload.yaml | 9 +---- .../kata-deploy-build-and-upload-payload.sh | 33 ++++++----------- 5 files changed, 18 insertions(+), 87 deletions(-) delete mode 100644 .github/workflows/ci-nightly-rust.yaml diff --git a/.github/workflows/ci-nightly-rust.yaml b/.github/workflows/ci-nightly-rust.yaml deleted file mode 100644 index 74a1c7ae4a..0000000000 --- a/.github/workflows/ci-nightly-rust.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: Kata Containers Nightly CI (Rust) -on: - schedule: - - cron: '0 1 * * *' # Run at 1 AM UTC (1 hour after script-based nightly) - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -permissions: {} - -jobs: - kata-containers-ci-on-push-rust: - permissions: - contents: read - packages: write - id-token: write - attestations: write - uses: ./.github/workflows/ci.yaml - with: - commit-hash: ${{ github.sha }} - pr-number: "nightly-rust" - tag: ${{ github.sha }}-nightly-rust - target-branch: ${{ github.ref_name }} - build-type: "rust" # Use Rust-based build - secrets: - AUTHENTICATED_IMAGE_PASSWORD: ${{ secrets.AUTHENTICATED_IMAGE_PASSWORD }} - AZ_APPID: ${{ secrets.AZ_APPID }} - AZ_TENANT_ID: ${{ secrets.AZ_TENANT_ID }} - AZ_SUBSCRIPTION_ID: ${{ secrets.AZ_SUBSCRIPTION_ID }} - CI_HKD_PATH: ${{ secrets.CI_HKD_PATH }} - ITA_KEY: ${{ secrets.ITA_KEY }} - QUAY_DEPLOYER_PASSWORD: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} - NGC_API_KEY: ${{ secrets.NGC_API_KEY }} - KBUILD_SIGN_PIN: ${{ secrets.KBUILD_SIGN_PIN }} - diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2c0c7c8cea..1c8d849d62 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,11 +19,6 @@ on: required: false type: string default: no - build-type: - description: The build type for kata-deploy. Use 'rust' for Rust-based build, empty or omit for script-based (default). - required: false - type: string - default: "" secrets: AUTHENTICATED_IMAGE_PASSWORD: required: true @@ -77,7 +72,6 @@ jobs: target-branch: ${{ inputs.target-branch }} runner: ubuntu-22.04 arch: amd64 - build-type: ${{ inputs.build-type }} secrets: QUAY_DEPLOYER_PASSWORD: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} @@ -110,7 +104,6 @@ jobs: target-branch: ${{ inputs.target-branch }} runner: ubuntu-24.04-arm arch: arm64 - build-type: ${{ inputs.build-type }} secrets: QUAY_DEPLOYER_PASSWORD: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} @@ -156,7 +149,6 @@ jobs: target-branch: ${{ inputs.target-branch }} runner: ubuntu-24.04-s390x arch: s390x - build-type: ${{ inputs.build-type }} secrets: QUAY_DEPLOYER_PASSWORD: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} @@ -175,7 +167,6 @@ jobs: target-branch: ${{ inputs.target-branch }} runner: ubuntu-24.04-ppc64le arch: ppc64le - build-type: ${{ inputs.build-type }} secrets: QUAY_DEPLOYER_PASSWORD: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} @@ -297,7 +288,7 @@ jobs: tarball-suffix: -${{ inputs.tag }} registry: ghcr.io repo: ${{ github.repository_owner }}/kata-deploy-ci - tag: ${{ inputs.tag }}-amd64${{ inputs.build-type == 'rust' && '-rust' || '' }} + tag: ${{ inputs.tag }}-amd64 commit-hash: ${{ inputs.commit-hash }} pr-number: ${{ inputs.pr-number }} target-branch: ${{ inputs.target-branch }} @@ -313,7 +304,7 @@ jobs: with: registry: ghcr.io repo: ${{ github.repository_owner }}/kata-deploy-ci - tag: ${{ inputs.tag }}-arm64${{ inputs.build-type == 'rust' && '-rust' || '' }} + tag: ${{ inputs.tag }}-arm64 commit-hash: ${{ inputs.commit-hash }} pr-number: ${{ inputs.pr-number }} target-branch: ${{ inputs.target-branch }} @@ -326,7 +317,7 @@ jobs: tarball-suffix: -${{ inputs.tag }} registry: ghcr.io repo: ${{ github.repository_owner }}/kata-deploy-ci - tag: ${{ inputs.tag }}-amd64${{ inputs.build-type == 'rust' && '-rust' || '' }} + tag: ${{ inputs.tag }}-amd64 commit-hash: ${{ inputs.commit-hash }} pr-number: ${{ inputs.pr-number }} target-branch: ${{ inputs.target-branch }} @@ -348,7 +339,7 @@ jobs: tarball-suffix: -${{ inputs.tag }} registry: ghcr.io repo: ${{ github.repository_owner }}/kata-deploy-ci - tag: ${{ inputs.tag }}-amd64${{ inputs.build-type == 'rust' && '-rust' || '' }} + tag: ${{ inputs.tag }}-amd64 commit-hash: ${{ inputs.commit-hash }} pr-number: ${{ inputs.pr-number }} target-branch: ${{ inputs.target-branch }} @@ -366,7 +357,7 @@ jobs: with: registry: ghcr.io repo: ${{ github.repository_owner }}/kata-deploy-ci - tag: ${{ inputs.tag }}-s390x${{ inputs.build-type == 'rust' && '-rust' || '' }} + tag: ${{ inputs.tag }}-s390x commit-hash: ${{ inputs.commit-hash }} pr-number: ${{ inputs.pr-number }} target-branch: ${{ inputs.target-branch }} @@ -380,7 +371,7 @@ jobs: with: registry: ghcr.io repo: ${{ github.repository_owner }}/kata-deploy-ci - tag: ${{ inputs.tag }}-ppc64le${{ inputs.build-type == 'rust' && '-rust' || '' }} + tag: ${{ inputs.tag }}-ppc64le commit-hash: ${{ inputs.commit-hash }} pr-number: ${{ inputs.pr-number }} target-branch: ${{ inputs.target-branch }} @@ -392,7 +383,7 @@ jobs: with: registry: ghcr.io repo: ${{ github.repository_owner }}/kata-deploy-ci - tag: ${{ inputs.tag }}-amd64${{ inputs.build-type == 'rust' && '-rust' || '' }} + tag: ${{ inputs.tag }}-amd64 commit-hash: ${{ inputs.commit-hash }} pr-number: ${{ inputs.pr-number }} target-branch: ${{ inputs.target-branch }} diff --git a/.github/workflows/payload-after-push.yaml b/.github/workflows/payload-after-push.yaml index 5a23e45441..891ccea029 100644 --- a/.github/workflows/payload-after-push.yaml +++ b/.github/workflows/payload-after-push.yaml @@ -82,7 +82,6 @@ jobs: target-branch: ${{ github.ref_name }} runner: ubuntu-22.04 arch: amd64 - build-type: "" # Use script-based build (default) secrets: QUAY_DEPLOYER_PASSWORD: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} @@ -100,7 +99,6 @@ jobs: target-branch: ${{ github.ref_name }} runner: ubuntu-24.04-arm arch: arm64 - build-type: "" # Use script-based build (default) secrets: QUAY_DEPLOYER_PASSWORD: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} @@ -118,7 +116,6 @@ jobs: target-branch: ${{ github.ref_name }} runner: s390x arch: s390x - build-type: "" # Use script-based build (default) secrets: QUAY_DEPLOYER_PASSWORD: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} @@ -136,7 +133,6 @@ jobs: target-branch: ${{ github.ref_name }} runner: ubuntu-24.04-ppc64le arch: ppc64le - build-type: "" # Use script-based build (default) secrets: QUAY_DEPLOYER_PASSWORD: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} diff --git a/.github/workflows/publish-kata-deploy-payload.yaml b/.github/workflows/publish-kata-deploy-payload.yaml index b3a6e63078..3561585afb 100644 --- a/.github/workflows/publish-kata-deploy-payload.yaml +++ b/.github/workflows/publish-kata-deploy-payload.yaml @@ -30,11 +30,6 @@ on: description: The arch of the tarball. required: true type: string - build-type: - description: The build type for kata-deploy. Use 'rust' for Rust-based build, empty or omit for script-based (default). - required: false - type: string - default: "" secrets: QUAY_DEPLOYER_PASSWORD: required: true @@ -106,10 +101,8 @@ jobs: REGISTRY: ${{ inputs.registry }} REPO: ${{ inputs.repo }} TAG: ${{ inputs.tag }} - BUILD_TYPE: ${{ inputs.build-type }} run: | ./tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-payload.sh \ "$(pwd)/kata-static.tar.zst" \ "${REGISTRY}/${REPO}" \ - "${TAG}" \ - "${BUILD_TYPE}" + "${TAG}" diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-payload.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-payload.sh index 54db10831c..f358df8c67 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-payload.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-payload.sh @@ -11,48 +11,35 @@ set -o nounset set -o pipefail set -o errtrace -KATA_DEPLOY_DIR="$(dirname "${0}")/../../kata-deploy" +KATA_DEPLOY_DIR="`dirname ${0}`/../../kata-deploy" KATA_DEPLOY_ARTIFACT="${1:-"kata-static.tar.zst"}" REGISTRY="${2:-"quay.io/kata-containers/kata-deploy"}" TAG="${3:-}" -BUILD_TYPE="${4:-}" - -# Determine which Dockerfile to use and build directory -DOCKERFILE="Dockerfile" -BUILD_SUFFIX="" - -if [ "${BUILD_TYPE}" = "rust" ]; then - DOCKERFILE="Dockerfile.rust" - BUILD_SUFFIX="-rust" - echo "Building Rust-based kata-deploy image" -else - echo "Building script-based kata-deploy image (default)" -fi echo "Copying ${KATA_DEPLOY_ARTIFACT} to ${KATA_DEPLOY_DIR}" -cp "${KATA_DEPLOY_ARTIFACT}" "${KATA_DEPLOY_DIR}" +cp ${KATA_DEPLOY_ARTIFACT} ${KATA_DEPLOY_DIR} -pushd "${KATA_DEPLOY_DIR}" +pushd ${KATA_DEPLOY_DIR} arch=$(uname -m) [ "$arch" = "x86_64" ] && arch="amd64" -IMAGE_TAG="${REGISTRY}:kata-containers-$(git rev-parse HEAD)-${arch}${BUILD_SUFFIX}" +IMAGE_TAG="${REGISTRY}:kata-containers-$(git rev-parse HEAD)-${arch}" -echo "Building the image using ${DOCKERFILE} from $(pwd)" -docker build --file "${DOCKERFILE}" --tag "${IMAGE_TAG}" . +echo "Building the image" +docker build --tag ${IMAGE_TAG} . echo "Pushing the image to the registry" -docker push "${IMAGE_TAG}" +docker push ${IMAGE_TAG} if [ -n "${TAG}" ]; then - ADDITIONAL_TAG="${REGISTRY}:${TAG}${BUILD_SUFFIX}" + ADDITIONAL_TAG="${REGISTRY}:${TAG}" echo "Building the ${ADDITIONAL_TAG} image" - docker build --file "${DOCKERFILE}" --tag "${ADDITIONAL_TAG}" . + docker build --tag ${ADDITIONAL_TAG} . echo "Pushing the image ${ADDITIONAL_TAG} to the registry" - docker push "${ADDITIONAL_TAG}" + docker push ${ADDITIONAL_TAG} fi popd