Use official python docker images
Change-Id: I27b1f108584892d64b78366d2bc39f616583af1e
This commit is contained in:
@@ -27,7 +27,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: rally-docker-build
|
name: rally-docker-build
|
||||||
parent: build-docker-image
|
parent: build-docker-image
|
||||||
nodeset: ubuntu-focal
|
nodeset: ubuntu-jammy
|
||||||
run: tests/ci/playbooks/docker-build-and-check.yaml
|
run: tests/ci/playbooks/docker-build-and-check.yaml
|
||||||
post-run: tests/ci/playbooks/fetch-html-and-json-reports.yaml
|
post-run: tests/ci/playbooks/fetch-html-and-json-reports.yaml
|
||||||
timeout: 1800
|
timeout: 1800
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: rally-docker-build-and-push
|
name: rally-docker-build-and-push
|
||||||
parent: build-docker-image
|
parent: build-docker-image
|
||||||
nodeset: ubuntu-focal
|
nodeset: ubuntu-jammy
|
||||||
run: tests/ci/playbooks/docker-build-check-and-push.yaml
|
run: tests/ci/playbooks/docker-build-check-and-push.yaml
|
||||||
post-run: tests/ci/playbooks/fetch-html-and-json-reports.yaml
|
post-run: tests/ci/playbooks/fetch-html-and-json-reports.yaml
|
||||||
timeout: 1800
|
timeout: 1800
|
||||||
|
|||||||
@@ -27,6 +27,12 @@ Fixed
|
|||||||
|
|
||||||
`Launchpad-bug #1956956 <https://launchpad.net/bugs/1956956>`_
|
`Launchpad-bug #1956956 <https://launchpad.net/bugs/1956956>`_
|
||||||
|
|
||||||
|
Changed
|
||||||
|
~~~~~~~
|
||||||
|
|
||||||
|
`xrally/xrally docker image <https://hub.docker.com/r/xrally/xrally>`_ switched
|
||||||
|
to use python3.9-slim as a base image instead of ubuntu 20.04.
|
||||||
|
|
||||||
Added
|
Added
|
||||||
~~~~~
|
~~~~~
|
||||||
|
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ them in complex tests scenarios that allows to perform all kinds of testing!
|
|||||||
|
|
||||||
# The purpose of xrally image or how to use it
|
# The purpose of xrally image or how to use it
|
||||||
|
|
||||||
**xrally** image bases on the latest LTS release of *ubuntu* which is 20.04 at
|
**xrally** image bases on the official python3.9-slim docker image.
|
||||||
the moment. It provides raw xrally framework with only in-tree plugins (no
|
It provides raw xrally framework with only in-tree plugins (no
|
||||||
pre-installed plugins for Kubernetes, OpenStack, etc).
|
pre-installed plugins for Kubernetes, OpenStack, etc).
|
||||||
|
|
||||||
You can use this image as a base image and extend it with installation of
|
You can use this image as a base image and extend it with installation of
|
||||||
|
|||||||
12
Dockerfile
12
Dockerfile
@@ -1,10 +1,8 @@
|
|||||||
FROM ubuntu:20.04
|
FROM python:3.9-slim
|
||||||
|
|
||||||
RUN sed -i s/^deb-src.*// /etc/apt/sources.list
|
RUN apt-get update && apt-get install --yes sudo vim git-core && \
|
||||||
|
|
||||||
RUN apt-get update && apt-get install --yes sudo python3-dev python3-pip vim git-core && \
|
|
||||||
apt clean && \
|
apt clean && \
|
||||||
pip3 --no-cache-dir install --upgrade pip setuptools && \
|
python3 -m pip --no-cache-dir install --upgrade pip setuptools && \
|
||||||
useradd -u 65500 -m rally && \
|
useradd -u 65500 -m rally && \
|
||||||
usermod -aG sudo rally && \
|
usermod -aG sudo rally && \
|
||||||
echo "rally ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/00-rally-user && \
|
echo "rally ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/00-rally-user && \
|
||||||
@@ -13,8 +11,8 @@ RUN apt-get update && apt-get install --yes sudo python3-dev python3-pip vim git
|
|||||||
COPY ./ /rally/source
|
COPY ./ /rally/source
|
||||||
WORKDIR /rally/source
|
WORKDIR /rally/source
|
||||||
|
|
||||||
RUN pip3 install . --constraint upper-constraints.txt --no-cache-dir && \
|
RUN python3 -m pip install . --constraint upper-constraints.txt --no-cache-dir && \
|
||||||
pip3 install pymysql psycopg2-binary --no-cache-dir && \
|
python3 -m pip install pymysql psycopg2-binary --no-cache-dir && \
|
||||||
mkdir -p /etc/rally && \
|
mkdir -p /etc/rally && \
|
||||||
echo "[database]" > /etc/rally/rally.conf && \
|
echo "[database]" > /etc/rally/rally.conf && \
|
||||||
echo "connection=sqlite:////home/rally/.rally/rally.db" >> /etc/rally/rally.conf
|
echo "connection=sqlite:////home/rally/.rally/rally.db" >> /etc/rally/rally.conf
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
- name: "Check availability of {{ rally_plugin_name }} plugin"
|
- name: "Check availability of {{ rally_plugin_name }} plugin"
|
||||||
shell: docker run {{ docker_image_tag }} plugin show {{ rally_plugin_name }}
|
shell: docker run {{ docker_image_tag }} plugin show {{ rally_plugin_name }}
|
||||||
|
|
||||||
- name: Execute the similar wokrloads as `tox -e self`
|
- name: Execute the similar workloads as `tox -e self`
|
||||||
shell:
|
shell:
|
||||||
cmd: >
|
cmd: >
|
||||||
python3 {{ rally_project_path }}/tests/ci/rally_self_job.py
|
python3 {{ rally_project_path }}/tests/ci/rally_self_job.py
|
||||||
|
|||||||
Reference in New Issue
Block a user