From 57733b901fecd31843977b746b94a321891fa3d3 Mon Sep 17 00:00:00 2001 From: Todd Malsbary Date: Fri, 9 Apr 2021 15:38:38 -0700 Subject: [PATCH] Enable KUD tests in both bmh and vm verifiers Signed-off-by: Todd Malsbary Change-Id: Idb11a67d4104adb59c3854b4e7e4a84602e845a2 --- Makefile | 8 ++++---- cmd/bpa-operator/Makefile | 37 ++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index f957d71..a501621 100644 --- a/Makefile +++ b/Makefile @@ -92,8 +92,8 @@ sdwan_verifier: bpa_op_install: pushd $(BPA_OPERATOR) && make docker && make deploy && popd -bpa_op_install_bmh_e2e: - pushd $(BPA_OPERATOR) && make docker_bmh_e2e && make deploy && popd +bpa_op_install_e2e: + pushd $(BPA_OPERATOR) && make docker_e2e && make deploy && popd bpa_op_delete: pushd $(BPA_OPERATOR) && make delete && popd @@ -110,9 +110,9 @@ bpa_op_e2e_virtletvm: bpa_op_unit: pushd $(BPA_OPERATOR) && make unit_test && popd -bpa_op_vm_verifier: bpa_op_install bpa_op_e2e_vm +bpa_op_vm_verifier: bpa_op_install_e2e bpa_op_e2e_vm -bpa_op_bmh_verifier: bpa_op_install_bmh_e2e bpa_op_e2e_bmh +bpa_op_bmh_verifier: bpa_op_install_e2e bpa_op_e2e_bmh bpa_op_virtletvm_verifier: bpa_op_install bpa_op_e2e_virtletvm diff --git a/cmd/bpa-operator/Makefile b/cmd/bpa-operator/Makefile index 07f0735..a34522f 100644 --- a/cmd/bpa-operator/Makefile +++ b/cmd/bpa-operator/Makefile @@ -6,30 +6,29 @@ docker: docker build --rm -t akraino.org/icn/bpa-operator:latest . -f build/Dockerfile git clone https://github.com/onap/multicloud-k8s.git cd multicloud-k8s && \ - docker build --network=host --rm \ - --build-arg http_proxy=${http_proxy} \ - --build-arg HTTP_PROXY=${HTTP_PROXY} \ - --build-arg https_proxy=${https_proxy} \ - --build-arg HTTPS_PROXY=${HTTPS_PROXY} \ - --build-arg no_proxy=${no_proxy} \ - --build-arg NO_PROXY=${NO_PROXY} \ - -t github.com/onap/multicloud-k8s:latest . -f kud/build/Dockerfile + docker build --network=host --rm \ + --build-arg http_proxy=${http_proxy} \ + --build-arg HTTP_PROXY=${HTTP_PROXY} \ + --build-arg https_proxy=${https_proxy} \ + --build-arg HTTPS_PROXY=${HTTPS_PROXY} \ + --build-arg no_proxy=${no_proxy} \ + --build-arg NO_PROXY=${NO_PROXY} \ + -t github.com/onap/multicloud-k8s:latest . -f kud/build/Dockerfile rm -rf multicloud-k8s -docker_bmh_e2e: +docker_e2e: docker build --rm -t akraino.org/icn/bpa-operator:latest . -f build/Dockerfile git clone https://github.com/onap/multicloud-k8s.git cd multicloud-k8s && \ - docker build --network=host --rm \ - --build-arg http_proxy=${http_proxy} \ - --build-arg HTTP_PROXY=${HTTP_PROXY} \ - --build-arg https_proxy=${https_proxy} \ - --build-arg HTTPS_PROXY=${HTTPS_PROXY} \ - --build-arg no_proxy=${no_proxy} \ - --build-arg NO_PROXY=${NO_PROXY} \ - --build-arg KUD_ENABLE_TESTS=true \ - --build-arg KUD_PLUGIN_ENABLED=true \ - -t github.com/onap/multicloud-k8s:latest . -f kud/build/Dockerfile + docker build --network=host --rm \ + --build-arg http_proxy=${http_proxy} \ + --build-arg HTTP_PROXY=${HTTP_PROXY} \ + --build-arg https_proxy=${https_proxy} \ + --build-arg HTTPS_PROXY=${HTTPS_PROXY} \ + --build-arg no_proxy=${no_proxy} \ + --build-arg NO_PROXY=${NO_PROXY} \ + --build-arg KUD_ENABLE_TESTS=true \ + -t github.com/onap/multicloud-k8s:latest . -f kud/build/Dockerfile rm -rf multicloud-k8s .PHONY: deploy -- 2.16.6