Skip to content

Test amal #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: cert_helm_chart
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ ENV TEMP_DIR=/tmp

# Install dependencies
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/bin/helm

# Install Go binary
ENV GO_DL_URL="https://golang.org/dl"
Expand Down Expand Up @@ -41,8 +45,10 @@ 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=$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
Expand Down Expand Up @@ -107,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"]
5 changes: 5 additions & 0 deletions run-cnf-suites.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion run-tnf-container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down