Skip to content

Commit

Permalink
Merge pull request #444 from ritikaguptams/cncf-job-migration-test
Browse files Browse the repository at this point in the history
Cncf job migration test
  • Loading branch information
k8s-ci-robot authored Jul 17, 2024
2 parents 66e3cb0 + b49686a commit dfbb82e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ capz/gmsa/configuration/configuration
capz/gmsa/configuration/gmsa-spec-writer-output.txt
helpers/hyper-v-mutating-webhook/bin/
capz/clusterctl
capz/tools
capz/tools
**/.vscode
7 changes: 6 additions & 1 deletion capz/run-capz-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ main() {
export CI="${CI:-""}"

set_azure_envs

set_ci_version
IS_PRESUBMIT="$(capz::util::should_build_kubernetes)"
echo "IS_PRESUBMIT=$IS_PRESUBMIT"
Expand Down Expand Up @@ -378,10 +379,14 @@ run_e2e_test() {
fi

ADDITIONAL_E2E_ARGS=()
if [[ "$CI" == "true" ]]; then
if [[ "$CI" == "true" && -n "${DOCKER_CONFIG_FILE:-""}" ]]; then
# private image repository doesn't have a way to promote images: https://github.com/kubernetes/k8s.io/pull/1929
# So we are using a custom repository for the test "Container Runtime blackbox test when running a container with a new image should be able to pull from private registry with secret [NodeConformance]"
# Must also set label preset-windows-private-registry-cred: "true" on the job

# This will not work in community cluster as this secret is not present (hence we only do it if ENV is set)
# On the community cluster we will use credential providers to a private registry in azure see:
# https://github.com/kubernetes-sigs/windows-testing/issues/446
export KUBE_TEST_REPO_LIST="$SCRIPT_ROOT/../images/image-repo-list-private-registry"
ADDITIONAL_E2E_ARGS+=("--docker-config-file=${DOCKER_CONFIG_FILE}")
fi
Expand Down

0 comments on commit dfbb82e

Please sign in to comment.