diff --git a/.github/workflows/test-integration.yaml b/.github/workflows/test-integration.yaml index 7d37479a..6e7872ea 100644 --- a/.github/workflows/test-integration.yaml +++ b/.github/workflows/test-integration.yaml @@ -24,10 +24,13 @@ jobs: run: ./hack/registry.sh - name: Allocate Cluster run: ./hack/allocate.sh + - name: Patch S2I Task + run: ./hack/patch-s2i-task.sh - name: Install Tekton run: ./hack/tekton.sh - name: Set up environment variables run: | + echo "TEKTON_TESTS_ENABLED=1" >> "$GITHUB_ENV" echo "GITLAB_TESTS_ENABLED=1" >> "$GITHUB_ENV" echo "GITLAB_HOSTNAME=gitlab.127.0.0.1.sslip.io" >> "$GITHUB_ENV" echo "GITLAB_ROOT_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32})" >> "$GITHUB_ENV" diff --git a/hack/allocate.sh b/hack/allocate.sh index 49dac4ab..888b07f5 100755 --- a/hack/allocate.sh +++ b/hack/allocate.sh @@ -71,6 +71,8 @@ containerdConfigPatches: - |- [plugins."io.containerd.grpc.v1.cri".registry.mirrors."localhost:50000"] endpoint = ["http://func-registry:5000"] + [plugins."io.containerd.grpc.v1.cri".registry.mirrors."registry.default.svc.cluster.local:5000"] + endpoint = ["http://func-registry:5000"] EOF sleep 10 kubectl wait pod --for=condition=Ready -l '!job-name' -n kube-system --timeout=5m @@ -206,6 +208,19 @@ data: host: "localhost:50000" help: "https://kind.sigs.k8s.io/docs/user/local-registry/" EOF + + # Make the registry available in cluster under registry.default.svc.cluster.local:5000. + # This is useful since for "*.local" registries HTTP (not HTTPS) is used by default by some applications. + kubectl apply -f - <