File tree Expand file tree Collapse file tree 12 files changed +5
-332
lines changed
Expand file tree Collapse file tree 12 files changed +5
-332
lines changed Original file line number Diff line number Diff line change @@ -133,16 +133,6 @@ jobs:
133133
134134 - uses : azure/setup-helm@v4.2.0
135135
136- - name : Run local e2e tests
137- if : ${{ !inputs.nightly }}
138- env :
139- KIND_CLUSTER_NAME : ${{ inputs.test_cluster_name }}
140- IMAGE_TAG : ${{ env.image_tag }}
141- IMAGE_REPO : ${{ secrets.registry }}/${{ inputs.distribution}}
142- DISTRO : ${{ inputs.distribution }}
143- run : |
144- make -f ./test/e2e/Makefile ci_test-fast
145-
146136 - name : Run slow local tests
147137 env :
148138 KIND_CLUSTER_NAME : ${{ inputs.test_cluster_name }}
Original file line number Diff line number Diff line change 1- fast :
2- collectorChart :
3- name : mocked_backend
4- version : 0.1.0
5- enabled : true
61slow :
72 collectorChart :
83 name : nr_backend
Original file line number Diff line number Diff line change @@ -4,8 +4,6 @@ whereClause:
44 template : " WHERE k8s.cluster.name='{{ .clusterName }}'"
55 vars :
66 - clusterName
7- fast :
8- enabled : false
97slow :
108 collectorChart :
119 name : newrelic/nr-k8s-otel-collector
Original file line number Diff line number Diff line change @@ -39,17 +39,6 @@ ci_load-image: REQUIRED_BINS=kind
3939ci_load-image : assert_require-binary assert_cluster-exists assert_image-tag-present
4040 kind load docker-image ${IMAGE_REPO} :${IMAGE_TAG} --name ${KIND_CLUSTER_NAME}
4141
42- .PHONY : ci_build-load-mocked-otlp-image
43- ci_build-load-mocked-otlp-image : REQUIRED_BINS=docker kind
44- ci_build-load-mocked-otlp-image : BUILD_PATH=${THIS_MAKEFILE_DIR}/mocked_otlp/http
45- ci_build-load-mocked-otlp-image : assert_require-binary assert_cluster-exists
46- docker build -t mocked_otlp:latest -f ${BUILD_PATH} /Dockerfile ${BUILD_PATH}
47- kind load docker-image mocked_otlp:latest --name ${KIND_CLUSTER_NAME}
48-
49- .PHONY : ci_test-fast
50- ci_test-fast : TEST_MODE=fastOnly
51- ci_test-fast : ci_load-image ci_build-load-mocked-otlp-image ci_test
52-
5342.PHONY : ci_test-slow
5443ci_test-slow : TEST_MODE=slowOnly
5544ci_test-slow : ci_load-image ci_test
@@ -88,11 +77,6 @@ local_create-cluster-if-not-exists:
8877local_build-image :
8978 cd $(ROOT_DIR ) && goreleaser --snapshot --clean --skip=sign
9079
91- .PHONY : local_test-fast
92- local_test-fast : TEST_MODE=fastOnly
93- local_test-fast : IMAGE_TAG=${MOST_RECENT_IMAGE_TAG}
94- local_test-fast : local_create-cluster-if-not-exists ci_test-fast
95-
9680.PHONY : local_test-slow
9781local_test-slow : TEST_MODE=slowOnly
9882local_test-slow : IMAGE_TAG=${MOST_RECENT_IMAGE_TAG}
Load Diff This file was deleted.
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ func TestLocalCollectorWithNrBackend(t *testing.T) {
2929
3030 kubectlOptions = k8sutil .NewKubectlOptions (TestNamespace )
3131 testId := testutil .NewTestId ()
32- testChart = chart .GetSlowTestChart (testSpec , testId )
32+ testChart = chart .GetSlowTestChart (testSpec )
3333
3434 hostnamePattern := nr .GetHostNamePattern (testId )
3535 t .Logf ("hostname used for test: %s" , hostnamePattern )
Original file line number Diff line number Diff line change @@ -27,17 +27,11 @@ func (m Meta) FullyQualifiedChartName() string {
2727}
2828
2929var shortNameToFactory = map [string ]func (version string ) Chart {
30- mockedBackendChartShortName : newMockedBackendChart ,
3130 nrBackendChartShortName : newNrBackendChart ,
3231 nrK8sOtelCollectorChartShortName : newNrK8sOtelCollector ,
3332}
3433
35- func GetFastTestChart (spec * spec.TestSpec ) Chart {
36- factory := shortNameToFactory [spec .Fast .CollectorChart .Name ]
37- return factory (spec .Fast .CollectorChart .Version )
38- }
39-
40- func GetSlowTestChart (spec * spec.TestSpec , testId string ) Chart {
34+ func GetSlowTestChart (spec * spec.TestSpec ) Chart {
4135 factory := shortNameToFactory [spec .Slow .CollectorChart .Name ]
42- return factory (spec .Fast .CollectorChart .Version )
36+ return factory (spec .Slow .CollectorChart .Version )
4337}
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments