Skip to content
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.

Sign up for GitHub

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

Dockerfile: do not build the legacy binary #2181

Merged
merged 1 commit into from
Jun 20, 2024
Merged

Dockerfile: do not build the legacy binary #2181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 21 additions & 21 deletions .github/workflows/pre-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,31 +344,31 @@ jobs:
- name: 'Test: Run without any TS, just get diagnostic information'
run: |
docker run --rm --network host \
-v $CERTSUITE_CONFIG_DIR:/usr/tnf/config:Z \
-v $CERTSUITE_OUTPUT_DIR:/usr/tnf/output:Z \
-v $CERTSUITE_CONFIG_DIR:/usr/certsuite/config:Z \
-v $CERTSUITE_OUTPUT_DIR:/usr/certsuite/output:Z \
${REGISTRY_LOCAL}/${CERTSUITE_IMAGE_NAME}:${CERTSUITE_IMAGE_TAG} \
./cnf-certification-test/certsuite run \
--output-dir=/usr/tnf/output \
--preflight-dockerconfig=/usr/tnf/config/dockerconfig \
certsuite run \
--output-dir=/usr/certsuite/output \
--preflight-dockerconfig=/usr/certsuite/config/dockerconfig \
--offline-db=/usr/offline-db \
--log-level=${SMOKE_TESTS_LOG_LEVEL} \
--config-file=/usr/tnf/config/tnf_config.yml \
--kubeconfig=/usr/tnf/config/kubeconfig \
--config-file=/usr/certsuite/config/tnf_config.yml \
--kubeconfig=/usr/certsuite/config/kubeconfig \

- name: 'Test: Run Smoke Tests in a Certsuite container with the certsuite command'
run: |
docker run --rm --network host \
-v $CERTSUITE_CONFIG_DIR:/usr/tnf/config:Z \
-v $CERTSUITE_OUTPUT_DIR:/usr/tnf/output:Z \
-v $CERTSUITE_CONFIG_DIR:/usr/certsuite/config:Z \
-v $CERTSUITE_OUTPUT_DIR:/usr/certsuite/output:Z \
${REGISTRY_LOCAL}/${CERTSUITE_IMAGE_NAME}:${CERTSUITE_IMAGE_TAG} \
./cnf-certification-test/certsuite run \
--output-dir=/usr/tnf/output \
--preflight-dockerconfig=/usr/tnf/config/dockerconfig \
certsuite run \
--output-dir=/usr/certsuite/output \
--preflight-dockerconfig=/usr/certsuite/config/dockerconfig \
--offline-db=/usr/offline-db \
--enable-data-collection=true \
--log-level=${SMOKE_TESTS_LOG_LEVEL} \
--config-file=/usr/tnf/config/tnf_config.yml \
--kubeconfig=/usr/tnf/config/kubeconfig \
--config-file=/usr/certsuite/config/tnf_config.yml \
--kubeconfig=/usr/certsuite/config/kubeconfig \
--label-filter="${SMOKE_TESTS_LABELS_FILTER}"

- name: Run sanity check on collector
Expand Down Expand Up @@ -398,16 +398,16 @@ jobs:
- name: 'Test: Run Preflight Specific Smoke Tests in a Certsuite container with the certsuite command'
run: |
docker run --rm --network host \
-v $CERTSUITE_CONFIG_DIR:/usr/tnf/config:Z \
-v $CERTSUITE_OUTPUT_DIR:/usr/tnf/output:Z \
-v $CERTSUITE_CONFIG_DIR:/usr/certsuite/config:Z \
-v $CERTSUITE_OUTPUT_DIR:/usr/certsuite/output:Z \
${REGISTRY_LOCAL}/${CERTSUITE_IMAGE_NAME}:${CERTSUITE_IMAGE_TAG} \
./cnf-certification-test/certsuite run \
--output-dir=/usr/tnf/output \
--preflight-dockerconfig=/usr/tnf/config/dockerconfig \
certsuite run \
--output-dir=/usr/certsuite/output \
--preflight-dockerconfig=/usr/certsuite/config/dockerconfig \
--offline-db=/usr/offline-db \
--log-level=${SMOKE_TESTS_LOG_LEVEL} \
--config-file=/usr/tnf/config/tnf_config.yml \
--kubeconfig=/usr/tnf/config/kubeconfig \
--config-file=/usr/certsuite/config/tnf_config.yml \
--kubeconfig=/usr/certsuite/config/kubeconfig \
--label-filter="preflight"

# Only run this job if the previous jobs are successful that build the ARM and x86 images.
Expand Down
54 changes: 20 additions & 34 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
FROM registry.access.redhat.com/ubi9/ubi:9.4-1123@sha256:d98fdae16212df566150ac975cab860cd8d2cb1b322ed9966d09a13e219112e9 AS build
ENV TNF_DIR=/usr/tnf
ENV CERTSUITE_DIR=/usr/certsuite
ENV \
TNF_SRC_DIR=${TNF_DIR}/tnf-src \
TNF_BIN_DIR=${TNF_DIR}/cnf-certification-test \
CERTSUITE_SRC_DIR=${CERTSUITE_DIR}/src \
TEMP_DIR=/tmp

# Install dependencies
# hadolint ignore=DL3041
RUN \
mkdir ${TNF_DIR} \
mkdir ${CERTSUITE_DIR} \
&& dnf update --assumeyes --disableplugin=subscription-manager \
&& dnf install --assumeyes --disableplugin=subscription-manager \
gcc \
Expand Down Expand Up @@ -75,30 +74,21 @@ RUN \
fi

# Copy all of the files into the source directory and then switch contexts
COPY . ${TNF_SRC_DIR}
WORKDIR ${TNF_SRC_DIR}
RUN make build-cnf-tests build-certsuite-tool
COPY . ${CERTSUITE_SRC_DIR}
WORKDIR ${CERTSUITE_SRC_DIR}

# Extract what's needed to run at a separate location
# Quote this to prevent word splitting.
# hadolint ignore=SC2046
RUN \
mkdir ${TNF_BIN_DIR} \
&& cp run-cnf-suites.sh ${TNF_DIR} \
# copy all JSON files to allow tests to run
&& cp --parents $(find . -name '*.json*') ${TNF_DIR} \
&& cp cnf-certification-test/cnf-certification-test ${TNF_BIN_DIR} \
# copy the tnf command binary
&& cp certsuite ${TNF_BIN_DIR}
# Build the certsuite binary
RUN make build-certsuite-tool \
&& cp certsuite ${CERTSUITE_DIR}

# Switch contexts back to the root TNF directory
WORKDIR ${TNF_DIR}
# Switch contexts back to the root CERTSUITE directory
WORKDIR ${CERTSUITE_DIR}

# Remove most of the build artefacts
RUN \
dnf remove --assumeyes --disableplugin=subscription-manager gcc git wget \
&& dnf clean all --assumeyes --disableplugin=subscription-manager \
&& rm -rf ${TNF_SRC_DIR} \
&& rm -rf ${CERTSUITE_SRC_DIR} \
&& rm -rf ${TEMP_DIR} \
&& rm -rf /root/.cache \
&& rm -rf /root/go/pkg \
Expand All @@ -115,28 +105,24 @@ FROM quay.io/testnetworkfunction/oct:latest AS db
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4-1134@sha256:a7d837b00520a32502ada85ae339e33510cdfdbc8d2ddf460cc838e12ec5fa5a

ENV \
TNF_DIR=/usr/tnf \
CERTSUITE_DIR=/usr/certsuite \
OSDK_BIN=/usr/local/osdk/bin

# Copy all of the necessary files over from the TNF_DIR
COPY --from=build ${TNF_DIR} ${TNF_DIR}
# Install the certsuite binary
COPY --from=build ${CERTSUITE_DIR} ${CERTSUITE_DIR}
RUN cp ${CERTSUITE_DIR}/certsuite /usr/local/bin

# Add operatorsdk binary to image
COPY --from=build ${OSDK_BIN} ${OSDK_BIN}

# Update the CNF containers, helm charts and operators DB
ENV \
TNF_OFFLINE_DB=/usr/offline-db \
CERTSUITE_OFFLINE_DB=/usr/offline-db \
OCT_DB_PATH=/usr/oct/cmd/tnf/fetch
COPY --from=db ${OCT_DB_PATH} ${TNF_OFFLINE_DB}
COPY --from=db ${OCT_DB_PATH} ${CERTSUITE_OFFLINE_DB}

ENV TNF_BIN_DIR=${TNF_DIR}/cnf-certification-test

ENV \
TNF_CONFIGURATION_PATH=/usr/tnf/config/tnf_config.yml \
KUBECONFIG=/usr/tnf/kubeconfig/config \
PFLT_DOCKERCONFIG=/usr/tnf/dockercfg/config.json \
PATH="${OSDK_BIN}:${TNF_BIN_DIR}:${PATH}"
WORKDIR ${TNF_DIR}
ENV PATH="${OSDK_BIN}:${PATH}"
WORKDIR ${CERTSUITE_DIR}
ENV SHELL=/bin/bash
CMD ["./run-cnf-suites.sh", "-o", "claim", "-f", "diagnostic"]
CMD ["certsuite", "-h"]
Loading