diff --git a/Dockerfile b/Dockerfile index e3493f1..45559cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,37 +1,43 @@ -FROM alpine:edge +FROM ubuntu:20.10 -LABEL maintainer="kmullins@redhat.com" +LABEL maintainer="syahmed@redhat.com" WORKDIR /tmp +ARG DEBIAN_FRONTEND=noninteractive # ALPINE -RUN apk update -RUN apk upgrade -RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing podman -RUN apk add --no-cache wget python3 py3-setuptools git dumb-init +RUN apt-get update +RUN apt-get upgrade -y +RUN apt-get install -y podman +RUN apt-get install -y wget python3 git dumb-init # Snafu Build Dependencies # TODO: A lot of the *-dev dependencies were added while attempting to build # snafu's requirements (mainly numpy, scipy, pandas). Now that these are # installed using Alpine's package manager, they may not all be necessary # anymore. -RUN apk add --no-cache py3-numpy py3-scipy py3-pandas gcc python3-dev \ - postgresql-dev libffi-dev libressl-dev libxml2 \ - libxml2-dev libxslt libxslt-dev libjpeg-turbo-dev \ - zlib-dev musl-dev +RUN apt-get install -y python3-numpy python3-scipy python3-pandas gcc python3-dev \ + postgresql-client-12 libffi-dev libxml2 \ + libxml2-dev libxslt-dev libjpeg-dev \ + zlib1g-dev musl-dev +# RUN apt-get install -y libressl-dev # Install required third-party packages RUN wget https://github.com/tsenart/vegeta/releases/download/v12.8.3/vegeta-12.8.3-linux-amd64.tar.gz RUN tar -xzf vegeta-12.8.3-linux-amd64.tar.gz RUN mv vegeta /usr/local/bin/vegeta # Install Python Dependencies -RUN python3 -m ensurepip +# RUN python3 -m ensurepip RUN python3 -m pip install --upgrade pip COPY requirements.txt . RUN pip3 install -r requirements.txt COPY tests.py . +RUN apt-get clean autoclean +RUN apt-get autoremove --yes +RUN rm -rf /var/lib/{apt,dpkg,cache,log}/ + ENTRYPOINT ["/usr/bin/dumb-init", "--"] CMD ["python3", "tests.py"] diff --git a/deploy/test.job.yaml b/deploy/test.job.yaml index ea3c9e9..309e270 100644 --- a/deploy/test.job.yaml +++ b/deploy/test.job.yaml @@ -66,26 +66,26 @@ spec: spec: containers: - name: python - image: quay.io/kmullins/quay-performance-test:latest + image: quay.io/syed/quay-performance-tests:latest securityContext: privileged: true env: - name: QUAY_HOST - value: quay.example.org + value: - name: QUAY_OAUTH_TOKEN - value: d3adb33f + value: - name: QUAY_ORG - value: perftest + value: loadtesting - name: ES_HOST - value: search-cloud-perf-lqrf3jjtaqo7727m7ynd2xyt4y.us-west-2.es.amazonaws.com + value: - name: ES_PORT - value: "80" + value: "9200" - name: PYTHONUNBUFFERED value: "0" resources: requests: cpu: "1" memory: "512Mi" + imagePullPolicy: Always restartPolicy: Never - imagePullPolicy: Always - backoffLimit: 0 \ No newline at end of file + backoffLimit: 0 diff --git a/requirements.txt b/requirements.txt index 370a4ac..dac7df6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ redis kubernetes elasticsearch>=7.0.0,<8.0.0 -git+https://github.com/cloud-bulldozer/snafu \ No newline at end of file +git+https://github.com/cloud-bulldozer/snafu