Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Unblock nightly pipeline #2863

Merged
merged 1 commit into from
Jul 19, 2024
Merged

ci: Unblock nightly pipeline #2863

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 37 additions & 6 deletions .pipelines/cni/cilium/nightly-release-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ stages:
- job: build_and_push_cilium_image
pool:
name: $(BUILD_POOL_NAME_DEFAULT)
strategy:
matrix:
cilium_agent:
type: docker-cilium-image
image: cilium
directory: cilium
cilium_operator_generic:
type: docker-operator-generic-image
image: operator-generic
directory: operator
steps:
- bash: |
set -ex
Expand All @@ -31,8 +41,31 @@ stages:
if [ ! -z $CILIUM_COMMIT_ID ]; then
git reset --hard $CILIUM_COMMIT_ID
fi
make docker-cilium-image
make docker-operator-generic-image

# Override current images used within dockerfiles
goImage=`cat ./images/$(directory)/Dockerfile | grep "ARG GOLANG_IMAGE" | awk '{print $2}'`
alpineImage=`cat ./images/$(directory)/Dockerfile | grep "ARG ALPINE_IMAGE" | awk '{print $2}'`

if ! [ -z $goImage ]; then
goTag=${goImage#*:}
goVersion=${goTag%@*}
goMCR=mcr.microsoft.com/oss/go/microsoft/golang:${goVersion}
echo "Golang MCR image: ${goMCR}"
GO_ARGS="--build-arg GOLANG_IMAGE=${goMCR} "
fi

if ! [ -z $alpineImage ]; then
alpineTag=${alpineImage#*:}
alpineVersion=${alpineTag%@*}
# Alpine images are no longer updated on MCR, use ACR Cache mirror
alpineACR=acnpublic.azurecr.io/alpine:${alpineVersion}
echo "alpine MCR image: ${alpineACR}"
ALPINE_ARGS="--build-arg ALPINE_IMAGE=${alpineACR} "
fi
BUILD_ARGS=${GO_ARGS}${ALPINE_ARGS}

DOCKER_FLAGS="$BUILD_ARGS" \
make $(type)
name: BuildCiliumImage
displayName: "Build Cilium Image"
- task: AzureCLI@1
Expand All @@ -48,10 +81,8 @@ stages:
scriptLocation: "inlineScript"
inlineScript: |
set -ex
docker tag quay.io/cilium/cilium:$(DOCKER_IMAGE_TAG) $(ACR).azurecr.io/cilium/cilium:$(DOCKER_IMAGE_TAG)
docker tag quay.io/cilium/operator-generic:$(DOCKER_IMAGE_TAG) $(ACR).azurecr.io/cilium/operator-generic:$(DOCKER_IMAGE_TAG)
docker push $(ACR).azurecr.io/cilium/cilium:$(DOCKER_IMAGE_TAG)
docker push $(ACR).azurecr.io/cilium/operator-generic:$(DOCKER_IMAGE_TAG)
docker tag quay.io/cilium/$(image):$(DOCKER_IMAGE_TAG) $(ACR).azurecr.io/cilium/$(image):$(DOCKER_IMAGE_TAG)
docker push $(ACR).azurecr.io/cilium/$(image):$(DOCKER_IMAGE_TAG)
name: "PushCiliumImage"
displayName: "Push Cilium Image"
- task: AzureCLI@1
Expand Down
Loading