From f1677641bc28721e65b9c95d65fe148b3eba9498 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Fri, 22 Sep 2023 06:00:33 -0500 Subject: [PATCH] remove rapidsai/ci references --- .github/workflows/build-image.yml | 7 +------ ci/create-multiarch-manifest.sh | 26 -------------------------- ci/generate-tags.sh | 12 ------------ ci/remove-temp-images.sh | 14 -------------- 4 files changed, 1 insertion(+), 58 deletions(-) delete mode 100755 ci/generate-tags.sh diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index a1d711a..9825626 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -57,11 +57,6 @@ jobs: LINUX_VER: ${{ inputs.LINUX_VER }} PYTHON_VER: ${{ inputs.PYTHON_VER }} ARCH: ${{ matrix.ARCH }} - - name: Generate Additional Tag - id: generate-additional-tag - run: ci/generate-tags.sh - env: - CURRENT_TAG: ${{ inputs.IMAGE_NAME }}-${{ matrix.ARCH }} - name: Build image uses: docker/build-push-action@v4 with: @@ -71,4 +66,4 @@ jobs: pull: true build-args: | ${{ steps.generate-build-args.outputs.ARGS }} - tags: ${{ steps.generate-additional-tag.outputs.TAG }} + tags: ${{ inputs.IMAGE_NAME }}-${{ matrix.ARCH }} diff --git a/ci/create-multiarch-manifest.sh b/ci/create-multiarch-manifest.sh index 0874113..cebebb6 100755 --- a/ci/create-multiarch-manifest.sh +++ b/ci/create-multiarch-manifest.sh @@ -31,29 +31,3 @@ if [[ echo "Skipping 'latest' manifest creation for PR workflow." fi fi - -# publish rapidsai/ci manifests too -if [[ $IMAGE_NAME =~ ci-conda ]]; then - IMAGE_NAME=$(echo "$IMAGE_NAME" | sed 's/ci-conda/ci/') - source_tags=() - tag="${IMAGE_NAME}" - for arch in $(echo "${ARCHES}" | jq .[] -r); do - source_tags+=("${tag}-${arch}") - done - - docker manifest create "${tag}" "${source_tags[@]}" - docker manifest push "${tag}" - if [[ - "${LATEST_UBUNTU_VER}" == "${LINUX_VER}" && - "${LATEST_CUDA_VER}" == "${CUDA_VER}" && - "${LATEST_PYTHON_VER}" == "${PYTHON_VER}" - ]]; then - # only create a 'latest' manifest if it is a non-PR workflow. - if [[ "${BUILD_TYPE}" != "pull-request" ]]; then - docker manifest create "rapidsai/ci:latest" "${source_tags[@]}" - docker manifest push "rapidsai/ci:latest" - else - echo "Skipping 'latest' manifest creation for PR workflow." - fi - fi -fi diff --git a/ci/generate-tags.sh b/ci/generate-tags.sh deleted file mode 100755 index a900fbf..0000000 --- a/ci/generate-tags.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -euo pipefail - -if [[ ! "$CURRENT_TAG" =~ "ci-conda" ]]; then - echo "TAG=$CURRENT_TAG" > "$GITHUB_OUTPUT" - exit 0 -fi - -CI_TAG=$(echo "$CURRENT_TAG" | sed 's/ci-conda/ci/') - -echo "TAG=$CURRENT_TAG,$CI_TAG" | tee --append "$GITHUB_OUTPUT" - diff --git a/ci/remove-temp-images.sh b/ci/remove-temp-images.sh index 06a1d79..121192d 100755 --- a/ci/remove-temp-images.sh +++ b/ci/remove-temp-images.sh @@ -26,17 +26,3 @@ for arch in $(echo "$ARCHES" | jq .[] -r); do -H "Authorization: JWT $HUB_TOKEN" \ "https://hub.docker.com/v2/repositories/$full_repo_name/tags/$tag-$arch/" done - -# delete rapidsai/ci imgs too -if [[ $IMAGE_NAME =~ ci-conda ]]; then - IMAGE_NAME=$(echo "$IMAGE_NAME" | sed 's/ci-conda/ci/') - full_repo_name=${IMAGE_NAME%%:*} - tag=${IMAGE_NAME##*:} - - for arch in $(echo "$ARCHES" | jq .[] -r); do - curl --fail-with-body -i -X DELETE \ - -H "Accept: application/json" \ - -H "Authorization: JWT $HUB_TOKEN" \ - "https://hub.docker.com/v2/repositories/$full_repo_name/tags/$tag-$arch/" - done -fi