From 136d7bbc758e423474444259272f51d97fbf9a28 Mon Sep 17 00:00:00 2001 From: David Elie-Dit-Cosaque Date: Tue, 15 Feb 2022 12:45:39 -0600 Subject: [PATCH 1/7] test --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c44212521..30f27c84f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ENV TNF_BIN_DIR=${TNF_DIR}/test-network-function ENV TEMP_DIR=/tmp # Install dependencies -RUN yum install -y gcc git jq make wget +RUN yum install -y gcc git jq make wget helm # Install Go binary ENV GO_DL_URL="https://golang.org/dl" From bd38ac832a6cb4a01c11ac82903bc04cd56c80e7 Mon Sep 17 00:00:00 2001 From: David Elie-Dit-Cosaque Date: Tue, 15 Feb 2022 13:57:22 -0600 Subject: [PATCH 2/7] test --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 30f27c84f..5ecabdf9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,11 @@ ENV TNF_BIN_DIR=${TNF_DIR}/test-network-function ENV TEMP_DIR=/tmp # Install dependencies -RUN yum install -y gcc git jq make wget helm +RUN yum install -y gcc git jq make wget +# install helm +RUN wget https://get.helm.sh/helm-v3.8.0-linux-amd64.tar.gz && \ + tar -xvf helm-v3.8.0-linux-amd64.tar.gz && \ + cp linux-amd64/helm /usr/local/bin/helm # Install Go binary ENV GO_DL_URL="https://golang.org/dl" From d3fa0c902ebe6ea0078256ed2f30a30eedbae2e9 Mon Sep 17 00:00:00 2001 From: David Elie-Dit-Cosaque Date: Wed, 16 Feb 2022 08:36:05 -0600 Subject: [PATCH 3/7] test --- run-tnf-container.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tnf-container.sh b/run-tnf-container.sh index 8035df1e2..559a1837d 100755 --- a/run-tnf-container.sh +++ b/run-tnf-container.sh @@ -25,7 +25,7 @@ export TNF_IMAGE_NAME=test-network-function export TNF_IMAGE_TAG=latest export TNF_OFFICIAL_ORG=quay.io/testnetworkfunction/ export TNF_OFFICIAL_IMAGE="${TNF_OFFICIAL_ORG}${TNF_IMAGE_NAME}:${TNF_IMAGE_TAG}" -export TNF_CMD=" helm list -A &&./run-cnf-suites.sh" +export TNF_CMD="./run-cnf-suites.sh" export OUTPUT_ARG="-o" export FOCUS_ARG="-f" export SKIP_ARG="-s" From d9b299083c2d82010e2c87beb12c338e4eefd8c6 Mon Sep 17 00:00:00 2001 From: David Elie-Dit-Cosaque Date: Wed, 16 Feb 2022 09:47:18 -0600 Subject: [PATCH 4/7] fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5ecabdf9f..7ed4f9a62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,7 @@ ENV PATH=${PATH}:"/usr/local/go/bin":${GOPATH}/"bin" # Git identifier to checkout ARG TNF_VERSION -ARG TNF_SRC_URL=https://github.com/test-network-function/test-network-function +ARG TNF_SRC_URL ARG GIT_CHECKOUT_TARGET=$TNF_VERSION # Git identifier to checkout for partner From bf1dad76269b27b2d954b8e111837d3572c9bb62 Mon Sep 17 00:00:00 2001 From: David Elie-Dit-Cosaque Date: Wed, 16 Feb 2022 10:09:58 -0600 Subject: [PATCH 5/7] fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7ed4f9a62..2d668a4df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,7 @@ ENV PATH=${PATH}:"/usr/local/go/bin":${GOPATH}/"bin" # Git identifier to checkout ARG TNF_VERSION -ARG TNF_SRC_URL +ARG TNF_SRC_URL=$TNF_SRC_URL ARG GIT_CHECKOUT_TARGET=$TNF_VERSION # Git identifier to checkout for partner From dcd724367da6173d21ef64d2bedb79629d51050c Mon Sep 17 00:00:00 2001 From: David Elie-Dit-Cosaque Date: Wed, 16 Feb 2022 10:35:19 -0600 Subject: [PATCH 6/7] fix --- Dockerfile | 2 ++ run-cnf-suites.sh | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/Dockerfile b/Dockerfile index 2d668a4df..569d12773 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,6 +47,8 @@ ENV PATH=${PATH}:"/usr/local/go/bin":${GOPATH}/"bin" ARG TNF_VERSION ARG TNF_SRC_URL=$TNF_SRC_URL ARG GIT_CHECKOUT_TARGET=$TNF_VERSION +RUN echo $TNF_SRC_URL +RUN echo $TNF_VERSION # Git identifier to checkout for partner ARG TNF_PARTNER_VERSION diff --git a/run-cnf-suites.sh b/run-cnf-suites.sh index 8d258054d..32f467ebb 100755 --- a/run-cnf-suites.sh +++ b/run-cnf-suites.sh @@ -3,6 +3,11 @@ set -x # defaults export OUTPUT_LOC="$PWD/test-network-function" +echo $PATH +which helm +helm list + + usage() { echo "$0 [-o OUTPUT_LOC] [-f SUITE...] -s [SUITE...] [-l LABEL...]" echo "Call the script and list the test suites to run" From 7ffa37ad37f90e80fccd80e2e560c7a3b1e23537 Mon Sep 17 00:00:00 2001 From: David Elie-Dit-Cosaque Date: Wed, 16 Feb 2022 11:15:39 -0600 Subject: [PATCH 7/7] fix --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 569d12773..78c5b8773 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN yum install -y gcc git jq make wget # install helm RUN wget https://get.helm.sh/helm-v3.8.0-linux-amd64.tar.gz && \ tar -xvf helm-v3.8.0-linux-amd64.tar.gz && \ - cp linux-amd64/helm /usr/local/bin/helm + cp linux-amd64/helm /usr/bin/helm # Install Go binary ENV GO_DL_URL="https://golang.org/dl" @@ -113,7 +113,6 @@ ENV TNF_CONFIGURATION_PATH=/usr/tnf/config/tnf_config.yml ENV KUBECONFIG=/usr/tnf/kubeconfig/config ENV TNF_PARTNER_SRC_DIR=$TNF_PARTNER_DIR/src ENV PATH="/usr/local/oc/bin:${PATH}" -ENV PATH="/usr/local/bin:${PATH}" WORKDIR /usr/tnf ENV SHELL=/bin/bash CMD ["./run-cnf-suites.sh", "-o", "claim", "-f", "diagnostic"]