Skip to content

Commit 2d7f904

Browse files
adding ubuntu 22 image for zuul (#253)
adding ubuntu 22 image for zuul Reviewed-by: Sergei Martynov
1 parent 4f7b249 commit 2d7f904

3 files changed

Lines changed: 66 additions & 0 deletions

File tree

containers/Dockerfile.u22

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
FROM ubuntu:22.04
2+
3+
ENV DEBIAN_FRONTEND=noninteractive \
4+
XDG_CACHE_HOME=/root/.cache
5+
6+
# Update and install required packages
7+
RUN apt-get update && apt-get install -y \
8+
iproute2 rsync git traceroute unzip bzip2 \
9+
libbz2-dev libffi-dev libsqlite3-dev rpm expect \
10+
make curl wget tar procps sudo findutils grep \
11+
libncurses-dev libssl-dev zlib1g-dev libkrb5-dev \
12+
cmake build-essential \
13+
python3.10\
14+
python3-pip python3-setuptools python3-dev python3-wheel \
15+
libxml2-dev libxslt1-dev \
16+
texlive texlive-latex-extra texlive-fonts-recommended \
17+
texlive-xetex texlive-lang-english latexmk \
18+
imagemagick inkscape \
19+
fonts-liberation \
20+
&& apt-get clean \
21+
&& rm -rf /var/lib/apt/lists/*
22+
23+
# Optional: set python alternatives if needed
24+
# update-alternatives --install /usr/bin/python python /usr/bin/python3.10 1
25+
26+
# Create pip symlink and install Python tools
27+
RUN ln -sf /usr/bin/pip3 /usr/bin/pip \
28+
&& pip install --no-cache-dir --user 'tox>=3.8.0' os-testr
29+
30+
# Sudo configuration similar to original
31+
RUN mv /etc/sudoers /etc/sudoers.d/zuul \
32+
&& grep includedir /etc/sudoers.d/zuul > /etc/sudoers \
33+
&& sed -e 's/.*includedir.*//' -i /etc/sudoers.d/zuul \
34+
&& chmod 440 /etc/sudoers
35+
36+
# Add zuul user
37+
RUN echo 'zuul:x:0:0:root:/root:/bin/bash' >> /etc/passwd
38+
39+
# Set PATH and working directory
40+
ENV PATH=/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
41+
WORKDIR /root
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
- job:
2+
name: zuul-config-build-image-u22
3+
description: Build a U22 image.
4+
parent: zuul-config-build-image
5+
vars: &zuul-u22_vars
6+
container_images:
7+
- context: containers
8+
container_filename: Dockerfile.u22
9+
registry: quay.io
10+
repository: opentelekomcloud/zuul-ubuntu
11+
tags: ['22']
12+
files: &zuul-u22_files
13+
- containers/Dockerfile.u22
14+
- zuul.d/container-images/ubuntu.yaml
15+
16+
- job:
17+
name: zuul-config-upload-image-u22
18+
description: Build and upload a u22 image.
19+
parent: zuul-config-upload-image
20+
vars: *zuul-u22_vars
21+
files: *zuul-u22_files
22+

zuul.d/project.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- zuul-config-build-image-f39
1010
- zuul-config-build-image-f40
1111
- zuul-config-build-image-f41
12+
- zuul-config-build-image-u22
1213
gate:
1314
jobs:
1415
- otc-tox-linters
@@ -17,10 +18,12 @@
1718
- zuul-config-build-image-f39
1819
- zuul-config-build-image-f40
1920
- zuul-config-build-image-f41
21+
- zuul-config-build-image-u22
2022
post:
2123
jobs:
2224
- zuul-config-upload-image-f37
2325
- zuul-config-upload-image-f38
2426
- zuul-config-upload-image-f39
2527
- zuul-config-upload-image-f40
2628
- zuul-config-upload-image-f41
29+
- zuul-config-upload-image-u22

0 commit comments

Comments
 (0)