Skip to content

Commit

Permalink
Fix: e2e fail.
Browse files Browse the repository at this point in the history
Signed-off-by: xuezhaojun <zxue@redhat.com>
  • Loading branch information
xuezhaojun committed Oct 23, 2024
1 parent 7232ee2 commit 024f7bf
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ build-e2e:

deploy-ocm:
curl -L https://raw.githubusercontent.com/open-cluster-management-io/clusteradm/main/install.sh | INSTALL_DIR=$(PWD) bash
@$(PWD)/clusteradm init --output-join-command-file join.sh --wait
$(PWD)/clusteradm init --bundle-version="latest" --output-join-command-file join.sh --wait
echo " loopback --force-internal-endpoint-lookup" >> join.sh && sh join.sh
$(PWD)/clusteradm accept --clusters loopback --wait 30
$(KUBECTL) wait --for=condition=ManagedClusterConditionAvailable managedcluster/loopback
Expand All @@ -83,20 +83,20 @@ ensure-helm:
.PHONY: ensure-helm

# CLUSTER_PROXY_ADDON_IMAGE is passed in by prow, represents the image of cluster-proxy-addon built with the current snapshot.
deploy-addon-for-e2e: ensure-helm
deploy-addon-for-e2e:
$(KUBECTL) apply -f chart/cluster-proxy-addon/crds/managedproxyconfigurations.yaml
$(KUBECTL) apply -f chart/cluster-proxy-addon/crds/managedproxyserviceresolvers.yaml
$(HELM) install \
helm install \
-n open-cluster-management-addon --create-namespace \
cluster-proxy-addon chart/cluster-proxy-addon \
--set global.pullPolicy="$(IMAGE_PULL_POLICY)" \
--set global.imageOverrides.cluster_proxy_addon="$(CLUSTER_PROXY_ADDON_IMAGE)" \
--set global.imageOverrides.cluster_proxy="$(IMAGE_CLUSTER_PROXY)" \
--set global.imageOverrides.cluster_proxy_addon="quay.io/stolostron/cluster-proxy-addon:latest" \
--set global.imageOverrides.cluster_proxy="quay.io/stolostron/cluster-proxy:latest" \
--set cluster_basedomain="$(shell $(KUBECTL) get ingress.config.openshift.io cluster -o=jsonpath='{.spec.domain}')"
$(KUBECTL) apply -f test/e2e/placement/ns.yaml
$(KUBECTL) apply -f test/e2e/placement/
.PHONY: deploy-addon-for-e2e

test-e2e: deploy-ocm deploy-addon-for-e2e build-e2e
export CLUSTER_BASE_DOMAIN=$(shell $(KUBECTL) get ingress.config.openshift.io cluster -o=jsonpath='{.spec.domain}') && ./e2e.test -test.v -ginkgo.v
export CLUSTER_BASE_DOMAIN="apps.server-foundation-sno-lite-g2dm4.dev04.red-chesterfield.com" && ./e2e.test -test.v -ginkgo.v
.PHONY: test-e2e

0 comments on commit 024f7bf

Please sign in to comment.