From 8098ad818db4795485f90818be4751507d8152d9 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 14 May 2024 09:43:07 +0100 Subject: [PATCH 1/2] Remove references to the 'edge1' cluster from the porch developer tutorial --- docs/tutorials/porch-development-environment/README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/tutorials/porch-development-environment/README.md b/docs/tutorials/porch-development-environment/README.md index c91f627a..99e021b8 100644 --- a/docs/tutorials/porch-development-environment/README.md +++ b/docs/tutorials/porch-development-environment/README.md @@ -9,11 +9,11 @@ and running to which a Porch instance running in Visual Studio Code can connect # Setup kind with MetalLB and Gitea -Follow steps 1-5 inclusive of the [Starting with Porch](https://github.com/nephio-project/porch/tree/main/docs/tutorials/starting-with-porch) tutorial. You now have two Kind clusters `management` and `edge1` running with Gitea installed on the `management` cluster. Gitea has the repositories `management` and `edge1` defined. +Follow steps 1-5 inclusive of the [Starting with Porch](https://github.com/nephio-project/porch/tree/main/docs/tutorials/starting-with-porch) tutorial. You now have the Kind cluster `management` running with Gitea installed on it. Gitea has the repository `management` defined. > **_NOTE:_** This [setup script](bin/setup.sh) automates steps 1-5 of the Starting with Porch tutorial. You may need to adapt this script to your local environment and also have [pre requisites](https://github.com/nephio-project/porch/tree/main/docs/tutorials/starting-with-porch#prerequisites) installed on the target machine. -> **_NOTE:_** This [cleardown script script](bin/cleardown.sh) clears everything down by deleting the `management` and `edge1` Kind clusters. USE WITH CARE. +> **_NOTE:_** This [cleardown script script](bin/cleardown.sh) clears everything down by deleting the `management` Kind cluster. USE WITH CARE. Switch to use the kind-management context if necessary: ``` @@ -492,7 +492,6 @@ porchctl repo get -A Sample output: ``` NAME TYPE CONTENT DEPLOYMENT READY ADDRESS -edge1 git Package true True http://172.18.255.200:3000/nephio/edge1.git external-blueprints git Package false True https://github.com/nephio-project/free5gc-packages.git management git Package false True http://172.18.255.200:3000/nephio/management.git ``` @@ -506,7 +505,6 @@ kubectl get repositories -n porch-demo Sample output: ``` NAME TYPE CONTENT DEPLOYMENT READY ADDRESS -edge1 git Package true True http://172.18.255.200:3000/nephio/edge1.git external-blueprints git Package false True https://github.com/nephio-project/free5gc-packages.git management git Package false True http://172.18.255.200:3000/nephio/management.git ``` From 4cb39f7fd9a3557f2b3157ae90e5ea8fbd36f702 Mon Sep 17 00:00:00 2001 From: Fiachra Corcoran Date: Tue, 14 May 2024 15:21:54 +0100 Subject: [PATCH 2/2] Fix presubmit unit test run --- .prow.yaml | 13 +------------ Makefile | 8 -------- default-go-test.mk | 2 +- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/.prow.yaml b/.prow.yaml index 9eed387f..2849fd39 100644 --- a/.prow.yaml +++ b/.prow.yaml @@ -1,7 +1,7 @@ presubmits: - name: presubmit-nephio-go-test decorate: true - run_if_changed: "(\\.go|Makefile)$" + run_if_changed: "(\\.go|Makefile|\\.mk)$" spec: containers: - image: nephio/gotests:1782782171367346176 @@ -9,14 +9,3 @@ presubmits: - make args: - ci-unit - - name: presubmit-porch-e2e - decorate: true - optional: true - run_if_changed: "(\\.go|Makefile)$" - spec: - containers: - - image: nephio/gotests:1782782171367346176 - command: - - make - args: - - ci-test-porch diff --git a/Makefile b/Makefile index 70fa7c2a..f8acabb8 100644 --- a/Makefile +++ b/Makefile @@ -159,19 +159,11 @@ generate: generate-api tidy: @for f in $(MODULES); do (cd $$f; echo "Tidying $$f"; go mod tidy) || exit 1; done -.PHONY: test-porch -test-porch: - #@for f in $(MODULES); do (cd $$f; echo "Testing $$f"; E2E=1 go test -v -race --count=1 ./...) || exit 1; done - @for f in $(MODULES); do (cd $$f; echo "Testing $$f"; go test -v -race --count=1 ./...) || exit 1; done - .PHONY: configure-git configure-git: git config --global --add user.name test git config --global --add user.email test@nephio.org -.PHONY: ci-test-porch -ci-test-porch: configure-git test-porch - .PHONY: ci-unit ci-unit: configure-git test diff --git a/default-go-test.mk b/default-go-test.mk index b7f9cbfa..b85b9a87 100644 --- a/default-go-test.mk +++ b/default-go-test.mk @@ -42,4 +42,4 @@ unit-clean: ## Clean up the artifacts created by the unit tests ifeq ($(CONTAINER_RUNNABLE), 0) $(CONTAINER_RUNTIME) system prune -f endif - rm ${TEST_COVERAGE_FILE} ${TEST_COVERAGE_HTML_FILE} ${TEST_COVERAGE_FUNC_FILE} > /dev/null 2>&1 + rm -f ${TEST_COVERAGE_FILE} ${TEST_COVERAGE_HTML_FILE} ${TEST_COVERAGE_FUNC_FILE} > /dev/null 2>&1