From 982501070da57694780cc03e93a175bd0bdc58d8 Mon Sep 17 00:00:00 2001 From: Jana Babovakova Date: Tue, 27 May 2025 12:34:45 +0200 Subject: [PATCH] CI: Added Docker for Rocky Linux 8 and 9. Updated both to supported versions 8.10, 9.5. --- .gitlab-ci.yml | 52 +++++++++++++++++++++++++++ misc/docker/rocky-08-amd64/Dockerfile | 21 +++++++++++ misc/docker/rocky-09-amd64/Dockerfile | 22 ++++++++++++ misc/gitlab/data.yml.j2 | 2 ++ 4 files changed, 97 insertions(+) create mode 100644 misc/docker/rocky-08-amd64/Dockerfile create mode 100644 misc/docker/rocky-09-amd64/Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc252d36b..5caf5ff6e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -145,6 +145,16 @@ docker-centos-8-amd64: IMG_NAME: "centos-8-amd64" <<: *docker-build +docker-rocky-08-amd64: + variables: + IMG_NAME: "rocky-08-amd64" + <<: *docker-build + +docker-rocky-09-amd64: + variables: + IMG_NAME: "rocky-09-amd64" + <<: *docker-build + docker-fedora-32-amd64: variables: IMG_NAME: "fedora-32-amd64" @@ -368,6 +378,20 @@ build-centos-8-amd64: optional: true image: registry.nic.cz/labs/bird:centos-8-amd64 +build-rocky-08-amd64: + <<: *build-docker-linux-amd64 + needs: + - job: docker-rocky-08-amd64 + optional: true + image: registry.nic.cz/labs/bird:rocky-08-amd64 + +build-rocky-09-amd64: + <<: *build-docker-linux-amd64 + needs: + - job: docker-rocky-09-amd64 + optional: true + image: registry.nic.cz/labs/bird:rocky-09-amd64 + build-fedora-32-amd64: <<: *build-docker-linux-amd64 needs: @@ -687,6 +711,22 @@ pkg-centos-8-amd64: - job: build-release image: registry.nic.cz/labs/bird:centos-8-amd64 +pkg-rocky-08-amd64: + <<: *pkg-rpm-wa + needs: + - job: build-rocky-08-amd64 + artifacts: false + - job: build-release + image: registry.nic.cz/labs/bird:rocky-08-amd64 + +pkg-rocky-09-amd64: + <<: *pkg-rpm-wa + needs: + - job: build-rocky-09-amd64 + artifacts: false + - job: build-release + image: registry.nic.cz/labs/bird:rocky-09-amd64 + pkg-fedora-32-amd64: <<: *pkg-rpm-wa needs: @@ -973,6 +1013,18 @@ install-centos-8-amd64: - job: pkg-centos-8-amd64 image: registry.nic.cz/labs/bird:centos-8-amd64 +install-rocky-08-amd64: + <<: *install-rpm + needs: + - job: pkg-rocky-08-amd64 + image: registry.nic.cz/labs/bird:rocky-08-amd64 + +install-rocky-09-amd64: + <<: *install-rpm + needs: + - job: pkg-rocky-09-amd64 + image: registry.nic.cz/labs/bird:rocky-09-amd64 + install-fedora-32-amd64: <<: *install-rpm needs: diff --git a/misc/docker/rocky-08-amd64/Dockerfile b/misc/docker/rocky-08-amd64/Dockerfile new file mode 100644 index 000000000..d0910adba --- /dev/null +++ b/misc/docker/rocky-08-amd64/Dockerfile @@ -0,0 +1,21 @@ +# bump number for image rebuild: 1 +# check latest supported version at https://wiki.rockylinux.org/rocky/version/#__tabbed_1_1 +FROM rockylinux/rockylinux:8.10 + +RUN yum -y upgrade +RUN yum -y install \ + gcc \ + make \ + flex \ + bison \ + autoconf \ + libssh-devel \ + ncurses-devel \ + readline-devel +RUN yum -y install \ + git \ + rpm-build \ + systemd-rpm-macros \ + python3 \ + python3-pip \ + python3-setuptools diff --git a/misc/docker/rocky-09-amd64/Dockerfile b/misc/docker/rocky-09-amd64/Dockerfile new file mode 100644 index 000000000..7c11f2a2b --- /dev/null +++ b/misc/docker/rocky-09-amd64/Dockerfile @@ -0,0 +1,22 @@ +# bump number for image rebuild: 1 +# check latest supported version at https://wiki.rockylinux.org/rocky/version/#__tabbed_1_2 +FROM rockylinux/rockylinux:9.5 + +RUN yum -y upgrade +RUN yum -y install \ + gcc \ + make \ + flex \ + bison \ + autoconf \ + libssh-devel \ + ncurses-devel \ + readline-devel +RUN yum -y install \ + git \ + rpm-build \ + systemd \ + systemd-rpm-macros \ + python3 \ + python3-pip \ + python3-setuptools diff --git a/misc/gitlab/data.yml.j2 b/misc/gitlab/data.yml.j2 index 005811f6f..a0a2d6dbc 100644 --- a/misc/gitlab/data.yml.j2 +++ b/misc/gitlab/data.yml.j2 @@ -8,6 +8,8 @@ distros: {% for name in ( 'centos-8', + 'rocky-08', + 'rocky-09', 'fedora-32', 'fedora-33', ) -%} -- 2.47.2