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

Jump to bottom

test: Fix local runs of K8sUpdates #16802

Merged
merged 1 commit into from
Jul 15, 2021
Merged

test: Fix local runs of K8sUpdates #16802

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func (c *CiliumTestConfigType) ParseFlags() {
"Specifies which image of cilium-operator to use during tests")
flagset.StringVar(&c.CiliumOperatorTag, "cilium.operator-tag", "",
"Specifies which tag of cilium-operator to use during tests")
flagset.StringVar(&c.CiliumOperatorSuffix, "cilium.operator-suffix", "",
flagset.StringVar(&c.CiliumOperatorSuffix, "cilium.operator-suffix", "-ci",
"Specifies a suffix to append to operator image after cloud-specific suffix")
flagset.StringVar(&c.HubbleRelayImage, "cilium.hubble-relay-image", "",
"Specifies which image of hubble-relay to use during tests")
Expand Down
24 changes: 12 additions & 12 deletions test/provision/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,18 @@ then
echo "building cilium-operator-generic image..."
make -B LOCKDEBUG=1 docker-operator-generic-image
echo "tagging cilium-operator images..."
docker tag "${CILIUM_OPERATOR_TAG}" "${REGISTRY}/${CILIUM_OPERATOR_TAG}"
docker tag "${CILIUM_OPERATOR_AWS_TAG}" "${REGISTRY}/${CILIUM_OPERATOR_AWS_TAG}"
docker tag "${CILIUM_OPERATOR_AZURE_TAG}" "${REGISTRY}/${CILIUM_OPERATOR_AZURE_TAG}"
docker tag "${CILIUM_OPERATOR_GENERIC_TAG}" "${REGISTRY}/${CILIUM_OPERATOR_GENERIC_TAG}"
echo "pushing cilium/operator image to ${REGISTRY}/${CILIUM_OPERATOR_TAG}..."
docker push "${REGISTRY}/${CILIUM_OPERATOR_TAG}"
echo "pushing cilium/operator-aws image to ${REGISTRY}/${CILIUM_OPERATOR_AWS_TAG}..."
docker push "${REGISTRY}/${CILIUM_OPERATOR_AWS_TAG}"
echo "pushing cilium/operator-azure image to ${REGISTRY}/${CILIUM_OPERATOR_AZURE_TAG}..."
docker push "${REGISTRY}/${CILIUM_OPERATOR_AZURE_TAG}"
echo "pushing cilium/operator-generic image to ${REGISTRY}/${CILIUM_OPERATOR_GENERIC_TAG}..."
docker push "${REGISTRY}/${CILIUM_OPERATOR_GENERIC_TAG}"
docker tag "${CILIUM_OPERATOR_TAG}" "${REGISTRY}/${CILIUM_OPERATOR_TAG}-ci"
docker tag "${CILIUM_OPERATOR_AWS_TAG}" "${REGISTRY}/${CILIUM_OPERATOR_AWS_TAG}-ci"
docker tag "${CILIUM_OPERATOR_AZURE_TAG}" "${REGISTRY}/${CILIUM_OPERATOR_AZURE_TAG}-ci"
docker tag "${CILIUM_OPERATOR_GENERIC_TAG}" "${REGISTRY}/${CILIUM_OPERATOR_GENERIC_TAG}-ci"
echo "pushing cilium/operator image to ${REGISTRY}/${CILIUM_OPERATOR_TAG}-ci..."
docker push "${REGISTRY}/${CILIUM_OPERATOR_TAG}-ci"
echo "pushing cilium/operator-aws image to ${REGISTRY}/${CILIUM_OPERATOR_AWS_TAG}-ci..."
docker push "${REGISTRY}/${CILIUM_OPERATOR_AWS_TAG}-ci"
echo "pushing cilium/operator-azure image to ${REGISTRY}/${CILIUM_OPERATOR_AZURE_TAG}-ci..."
docker push "${REGISTRY}/${CILIUM_OPERATOR_AZURE_TAG}-ci"
echo "pushing cilium/operator-generic image to ${REGISTRY}/${CILIUM_OPERATOR_GENERIC_TAG}-ci..."
docker push "${REGISTRY}/${CILIUM_OPERATOR_GENERIC_TAG}-ci"
echo "removing local cilium-operator image..."
docker rmi "${CILIUM_OPERATOR_TAG}:latest"
echo "removing local cilium-operator image..."
Expand Down