From 943c76d2b4b283dbfbee66a87b0b852cfce302f3 Mon Sep 17 00:00:00 2001 From: phala Date: Wed, 1 Mar 2023 10:09:40 +0100 Subject: [PATCH 1/2] Add __init__.py to resources --- testsuite/resources/performance/__init__.py | 0 testsuite/resources/performance/files/__init__.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 testsuite/resources/performance/__init__.py create mode 100644 testsuite/resources/performance/files/__init__.py diff --git a/testsuite/resources/performance/__init__.py b/testsuite/resources/performance/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/testsuite/resources/performance/files/__init__.py b/testsuite/resources/performance/files/__init__.py new file mode 100644 index 00000000..e69de29b From 7bc44bba1b7e5f4e7330a83762be656f51a4be71 Mon Sep 17 00:00:00 2001 From: phala Date: Wed, 1 Mar 2023 10:10:19 +0100 Subject: [PATCH 2/2] Update Dockerfile - Switch to CentOS Stream 9 - Add CFSSL --- Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3648324b..a36af492 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,20 @@ -FROM quay.io/centos/centos:stream +FROM quay.io/centos/centos:stream9 LABEL description="Run Kuadrant integration tests \ Default ENTRYPOINT: 'make' and CMD: 'test' \ Bind dynaconf settings to /opt/secrets.yaml \ Bind kubeconfig to /opt/kubeconfig \ Bind a dir to /test-run-results to get reports " -RUN useradd --no-log-init -u 1001 -r -U -m testsuite -RUN dnf install -y python3.9 make git && dnf clean all +RUN useradd --no-log-init -u 1001 -g root -m testsuite +RUN dnf install -y python3 pip make git && dnf clean all RUN curl https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz >/tmp/oc.tgz && \ tar xzf /tmp/oc.tgz -C /usr/local/bin && \ rm /tmp/oc.tgz +RUN curl -L https://github.com/cloudflare/cfssl/releases/download/v1.6.3/cfssl_1.6.3_linux_amd64 >/usr/bin/cfssl && \ + chmod +x /usr/bin/cfssl + RUN python3 -m pip --no-cache-dir install pipenv WORKDIR /opt/workdir/kuadrant-testsuite @@ -21,7 +24,7 @@ COPY . . RUN mkdir -m 0700 /test-run-results && chown testsuite /test-run-results && \ chown testsuite -R /opt/workdir/* -USER 1001 +USER testsuite ENV KUBECONFIG=/run/kubeconfig \