Skip to content
This repository was archived by the owner on Apr 11, 2024. It is now read-only.

Commit d6f54fb

Browse files
committed
test(e2e): Rename config for CAREN rather than CRE
1 parent ae3e809 commit d6f54fb

File tree

7 files changed

+12
-9
lines changed

7 files changed

+12
-9
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ node_modules/
4040
/cluster.yaml
4141
/runtime-extension-components.yaml
4242
/_artifacts/
43-
test/e2e/config/cre-envsubst.yaml
43+
test/e2e/config/caren-envsubst.yaml

make/go.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ bench.%: ; $(info $(M) running benchmarks$(if $(GOTEST_RUN), matching "$(GOTEST_
7474

7575
E2E_PARALLEL_NODES ?= $(shell nproc --ignore=1)
7676
E2E_FLAKE_ATTEMPTS ?= 1
77-
E2E_CONF_FILE ?= $(REPO_ROOT)/test/e2e/config/cre.yaml
78-
E2E_CONF_FILE_ENVSUBST ?= $(REPO_ROOT)/test/e2e/config/cre-envsubst.yaml
77+
E2E_CONF_FILE ?= $(REPO_ROOT)/test/e2e/config/caren.yaml
78+
E2E_CONF_FILE_ENVSUBST ?= $(basename $(E2E_CONF_FILE))-envsubst.yaml
7979
ARTIFACTS ?= ${REPO_ROOT}/_artifacts
8080

8181
.PHONY: e2e-test

metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@ releaseSeries:
1616
- major: 0
1717
minor: 5
1818
contract: v1beta1
19+
- major: 0
20+
minor: 6
21+
contract: v1beta1

test/e2e/config/cre.yaml renamed to test/e2e/config/caren.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2024 D2iQ, Inc. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
managementClusterName: cre-e2e
4+
managementClusterName: caren-e2e
55

66
images:
77
- name: ko.local/cluster-api-runtime-extensions-nutanix:${E2E_IMAGE_TAG}
@@ -101,12 +101,12 @@ providers:
101101
type: "url"
102102
contract: v1beta1
103103
files:
104-
- sourcePath: "../data/shared/v1beta1-helm/metadata.yaml"
104+
- sourcePath: "../data/shared/v1beta1-caaph/metadata.yaml"
105105
replacements:
106106
- old: --metrics-addr=127.0.0.1:8080
107107
new: --metrics-addr=:8080
108108

109-
- name: cre
109+
- name: caren
110110
type: RuntimeExtensionProvider
111111
versions:
112112
- name: "{go://github.com/d2iq-labs/[email protected]}"
@@ -125,7 +125,7 @@ providers:
125125
type: "url"
126126
contract: v1beta1
127127
files:
128-
- sourcePath: "../data/shared/v1beta1-cre/metadata.yaml"
128+
- sourcePath: "../data/shared/v1beta1-caren/metadata.yaml"
129129
replacements:
130130
- old: "--v=0"
131131
new: "--v=8"

test/e2e/e2e_suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func init() { //nolint:gochecknoinits // Idiomatically used to set up flags.
7575
func TestE2E(t *testing.T) {
7676
ctrl.SetLogger(klog.Background())
7777
RegisterFailHandler(Fail)
78-
RunSpecs(t, "cre-e2e")
78+
RunSpecs(t, "caren-e2e")
7979
}
8080

8181
// Using a SynchronizedBeforeSuite for controlling how to create resources shared across ParallelNodes (~ginkgo
@@ -238,7 +238,7 @@ func setupBootstrapCluster(
238238
} else {
239239
// Loading image for already created cluster
240240
imagesInput := capibootstrap.LoadImagesToKindClusterInput{
241-
Name: "cre-e2e",
241+
Name: "caren-e2e",
242242
Images: config.Images,
243243
}
244244
err := capibootstrap.LoadImagesToKindCluster(context.TODO(), imagesInput)

0 commit comments

Comments
 (0)