]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
CI: Refactored gitlab files to one directory
authorMaria Matejka <mq@ucw.cz>
Mon, 23 Mar 2026 21:30:22 +0000 (22:30 +0100)
committerMaria Matejka <mq@ucw.cz>
Tue, 7 Apr 2026 09:50:51 +0000 (11:50 +0200)
Now the gitlab dockerfiles are inside the gitlab directory and it's
outside misc/ as it never actually belonged to misc.

51 files changed:
.gitlab-ci.yml
Makefile.in
gitlab/Makefile [moved from misc/gitlab/Makefile with 100% similarity]
gitlab/README.md [moved from misc/gitlab/README.md with 65% similarity]
gitlab/data.yml.j2 [moved from misc/gitlab/data.yml.j2 with 100% similarity]
gitlab/docker/centos-7-amd64/Dockerfile [moved from misc/docker/centos-7-amd64/Dockerfile with 100% similarity]
gitlab/docker/centos-8-amd64/Dockerfile [moved from misc/docker/centos-8-amd64/Dockerfile with 100% similarity]
gitlab/docker/debian-10-amd64/Dockerfile [moved from misc/docker/debian-10-amd64/Dockerfile with 100% similarity]
gitlab/docker/debian-10-i386/Dockerfile [moved from misc/docker/debian-10-i386/Dockerfile with 100% similarity]
gitlab/docker/debian-11-amd64/Dockerfile [moved from misc/docker/debian-11-amd64/Dockerfile with 100% similarity]
gitlab/docker/debian-11-i386/Dockerfile [moved from misc/docker/debian-11-i386/Dockerfile with 100% similarity]
gitlab/docker/debian-12-amd64/Dockerfile [moved from misc/docker/debian-12-amd64/Dockerfile with 100% similarity]
gitlab/docker/debian-12-i386/Dockerfile [moved from misc/docker/debian-12-i386/Dockerfile with 100% similarity]
gitlab/docker/debian-13-amd64/Dockerfile [moved from misc/docker/debian-13-amd64/Dockerfile with 100% similarity]
gitlab/docker/debian-13-i386/Dockerfile [moved from misc/docker/debian-13-i386/Dockerfile with 100% similarity]
gitlab/docker/debian-testing-amd64/Dockerfile [moved from misc/docker/debian-testing-amd64/Dockerfile with 100% similarity]
gitlab/docker/debian-testing-i386/Dockerfile [moved from misc/docker/debian-testing-i386/Dockerfile with 100% similarity]
gitlab/docker/docbuilder/Dockerfile [moved from misc/docker/docbuilder/Dockerfile with 100% similarity]
gitlab/docker/fedora-32-amd64/Dockerfile [moved from misc/docker/fedora-32-amd64/Dockerfile with 100% similarity]
gitlab/docker/fedora-33-amd64/Dockerfile [moved from misc/docker/fedora-33-amd64/Dockerfile with 100% similarity]
gitlab/docker/fedora-34-amd64/Dockerfile [moved from misc/docker/fedora-34-amd64/Dockerfile with 100% similarity]
gitlab/docker/fedora-35-amd64/Dockerfile [moved from misc/docker/fedora-35-amd64/Dockerfile with 100% similarity]
gitlab/docker/fedora-36-amd64/Dockerfile [moved from misc/docker/fedora-36-amd64/Dockerfile with 100% similarity]
gitlab/docker/fedora-37-amd64/Dockerfile [moved from misc/docker/fedora-37-amd64/Dockerfile with 100% similarity]
gitlab/docker/fedora-38-amd64/Dockerfile [moved from misc/docker/fedora-38-amd64/Dockerfile with 100% similarity]
gitlab/docker/fedora-39-amd64/Dockerfile [moved from misc/docker/fedora-39-amd64/Dockerfile with 100% similarity]
gitlab/docker/fedora-40-amd64/Dockerfile [moved from misc/docker/fedora-40-amd64/Dockerfile with 100% similarity]
gitlab/docker/fedora-41-amd64/Dockerfile [moved from misc/docker/fedora-41-amd64/Dockerfile with 100% similarity]
gitlab/docker/fedora-42-amd64/Dockerfile [moved from misc/docker/fedora-42-amd64/Dockerfile with 100% similarity]
gitlab/docker/fedora-43-amd64/Dockerfile [moved from misc/docker/fedora-43-amd64/Dockerfile with 100% similarity]
gitlab/docker/opensuse-15.0-amd64/Dockerfile [moved from misc/docker/opensuse-15.0-amd64/Dockerfile with 100% similarity]
gitlab/docker/opensuse-15.1-amd64/Dockerfile [moved from misc/docker/opensuse-15.1-amd64/Dockerfile with 100% similarity]
gitlab/docker/opensuse-15.2-amd64/Dockerfile [moved from misc/docker/opensuse-15.2-amd64/Dockerfile with 100% similarity]
gitlab/docker/opensuse-15.3-amd64/Dockerfile [moved from misc/docker/opensuse-15.3-amd64/Dockerfile with 100% similarity]
gitlab/docker/opensuse-15.4-amd64/Dockerfile [moved from misc/docker/opensuse-15.4-amd64/Dockerfile with 100% similarity]
gitlab/docker/opensuse-15.5-amd64/Dockerfile [moved from misc/docker/opensuse-15.5-amd64/Dockerfile with 100% similarity]
gitlab/docker/opensuse-16.0-amd64/Dockerfile [moved from misc/docker/opensuse-16.0-amd64/Dockerfile with 100% similarity]
gitlab/docker/oracle-08-amd64/Dockerfile [moved from misc/docker/oracle-08-amd64/Dockerfile with 100% similarity]
gitlab/docker/oracle-09-amd64/Dockerfile [moved from misc/docker/oracle-09-amd64/Dockerfile with 100% similarity]
gitlab/docker/oracle-10-amd64/Dockerfile [moved from misc/docker/oracle-10-amd64/Dockerfile with 100% similarity]
gitlab/docker/rocky-08-amd64/Dockerfile [moved from misc/docker/rocky-08-amd64/Dockerfile with 100% similarity]
gitlab/docker/rocky-09-amd64/Dockerfile [moved from misc/docker/rocky-09-amd64/Dockerfile with 100% similarity]
gitlab/docker/ubuntu-18.04-amd64/Dockerfile [moved from misc/docker/ubuntu-18.04-amd64/Dockerfile with 100% similarity]
gitlab/docker/ubuntu-20.04-amd64/Dockerfile [moved from misc/docker/ubuntu-20.04-amd64/Dockerfile with 100% similarity]
gitlab/docker/ubuntu-22.04-amd64/Dockerfile [moved from misc/docker/ubuntu-22.04-amd64/Dockerfile with 100% similarity]
gitlab/docker/ubuntu-24.04-amd64/Dockerfile [moved from misc/docker/ubuntu-24.04-amd64/Dockerfile with 100% similarity]
gitlab/docker/ubuntu-25.04-amd64/Dockerfile [moved from misc/docker/ubuntu-25.04-amd64/Dockerfile with 100% similarity]
gitlab/docker/ubuntu-25.10-amd64/Dockerfile [moved from misc/docker/ubuntu-25.10-amd64/Dockerfile with 100% similarity]
gitlab/pipeline.py [moved from misc/gitlab/pipeline.py with 100% similarity]
gitlab/template.yml.j2 [moved from misc/gitlab/template.yml.j2 with 98% similarity]
misc/docker/README.md [deleted file]

index 5d7706c79e2888b60f2685ec2409fd0a56cd7057..7df118b119477cf4e2fc22a87b4e6445cedd6638 100644 (file)
@@ -4,7 +4,7 @@
 #####                                                 #####
 ###########################################################
 #####                                                 #####
-##### This file is autogenerated from misc/gitlab/.   #####
+##### This file is autogenerated from gitlab/.        #####
 ##### Edit those files and run `make gitlab` instead. #####
 #####                                                 #####
 ###########################################################
@@ -201,7 +201,7 @@ pipeline-uptodate:
   script:
   - autoreconf -i
   - ./configure
-  - touch misc/gitlab/template.yml.j2
+  - touch gitlab/template.yml.j2
   - make gitlab-venv
   - git status --porcelain
   - git diff --exit-code
@@ -258,8 +258,8 @@ tag-collect:
   # base image is never checked. However, pull always asks and updates the
   # image only if it changed ‒ therefore, the cache is used unless there's a
   # change.
-  - $DOCKER_CMD pull `sed -ne 's/^FROM //p' "misc/docker/$IMG_NAME/Dockerfile"`
-  - $DOCKER_CMD build -t "bird:$IMG_NAME" "misc/docker/$IMG_NAME"
+  - $DOCKER_CMD pull `sed -ne 's/^FROM //p' "gitlab/docker/$IMG_NAME/Dockerfile"`
+  - $DOCKER_CMD build -t "bird:$IMG_NAME" "gitlab/docker/$IMG_NAME"
   - $DOCKER_CMD tag "bird:$IMG_NAME" "$IMG_BASE:$IMG_NAME"
   - $DOCKER_CMD push "$IMG_BASE:$IMG_NAME"
   after_script:
index 336c4ab3e48d45c4047755887a034a490f5cda58..2e5e4e89181ee48f39b5260db563ac6eb2415c28 100644 (file)
@@ -78,7 +78,7 @@ cli: $(client)
 $(daemon): LIBS += $(DAEMON_LIBS)
 
 # Include directories
-dirs := client conf doc filter lib nest test misc/gitlab $(addprefix proto/,$(protocols)) @sysdep_dirs@
+dirs := client conf doc filter lib nest test gitlab $(addprefix proto/,$(protocols)) @sysdep_dirs@
 
 # conf/Makefile declarations needed for all other modules
 conf-lex-targets := $(addprefix $(objdir)/conf/,cf-lex.o)
similarity index 100%
rename from misc/gitlab/Makefile
rename to gitlab/Makefile
similarity index 65%
rename from misc/gitlab/README.md
rename to gitlab/README.md
index de4a9dede98e1240d276f7d8a318580e4c9d5950..c030c6e51ca8999833ca1802d8df5673425960d6 100644 (file)
@@ -98,3 +98,52 @@ prepared with all the build dependencies, to shorten build times.
 TODO:
 
 - add on-demand triggers from the gitlab web ui
+
+# Docker files for our test machinery
+
+**These files are not distribution files for running BIRD. We currently
+do not supply official BIRD images and do not prepare any Docker files ourselves.**
+
+We build for the major Linux distributions, FreeBSD and OpenBSD. If you feel
+that your favourite Linux distribution is missing, please send a patch.
+
+Where to add your favourite Linux distribution:
+
+- add an appropriate dockerfile here
+- possibly add `pkg-*` and `install-*` template job in `gitlab/template.yml.j2`
+- add your distribution into the `distros` list in `gitlab/data.yml.j2`
+- run `make gitlab-local` or `make gitlab-venv` to rebuild `.gitlab-ci.yml`
+
+Rebuilding the docker images is done by triggering the appropriate pipeline manually in Gitlab.
+
+When images are disused, check [the registry](https://gitlab.nic.cz/labs/bird/container_registry/)
+and untag them so that they can be garbage-collected.
+
+## Debian-based distributions
+
+We support Debian between oldoldstable and testing. If not, poke us.
+
+We support Ubuntu LTS at least 5 years old and non-LTS before EOL. After EOL,
+the non-LTS package repositories tend to disappear quite quickly so we don't
+have resources to build against.
+
+## RedHat-based distributions
+
+We support OpenSUSE, Fedora, CentOS 7+8, Rocky Linux and Oracle Linux. If you are
+missing your favourite new release, poke us. We are discontinuing the old
+releases as they stop working.
+
+The current support for CentOS 7 and 8 has been paid for and we may drop it without
+further notice at the exact moment the customer stops using it.
+
+We failed to find a reliable Docker image for Rocky Linux 10.
+
+## Any other based distributions
+
+We currently don't package for e.g. Alpine, Arch, Gentoo, Mint or Slackware.
+Contributions are open, please refer to `CONTRIBUTING.md` for further information.
+
+## FreeBSD and OpenBSD
+
+These are not built in Docker but in proper virtuals in QEMU, refer to
+<https://gitlab.nic.cz/labs/bird-tools/-/tree/master/birdlab-tmp>
similarity index 100%
rename from misc/gitlab/data.yml.j2
rename to gitlab/data.yml.j2
similarity index 100%
rename from misc/gitlab/pipeline.py
rename to gitlab/pipeline.py
similarity index 98%
rename from misc/gitlab/template.yml.j2
rename to gitlab/template.yml.j2
index 7cdf5a3dc581ff320b8c577a8da0897c0be6a375..c58cac923ee8313159ad47c43d6a782384660467 100644 (file)
@@ -4,7 +4,7 @@
 #####                                                 #####
 ###########################################################
 #####                                                 #####
-##### This file is autogenerated from misc/gitlab/.   #####
+##### This file is autogenerated from gitlab/.        #####
 ##### Edit those files and run `make gitlab` instead. #####
 #####                                                 #####
 ###########################################################
@@ -188,7 +188,7 @@ pipeline-uptodate:
   script:
   - autoreconf -i
   - ./configure
-  - touch misc/gitlab/template.yml.j2
+  - touch gitlab/template.yml.j2
   - make gitlab-venv
   - git status --porcelain
   - git diff --exit-code
@@ -243,8 +243,8 @@ tag-collect:
   # base image is never checked. However, pull always asks and updates the
   # image only if it changed ‒ therefore, the cache is used unless there's a
   # change.
-  - $DOCKER_CMD pull `sed -ne 's/^FROM //p' "misc/docker/$IMG_NAME/Dockerfile"`
-  - $DOCKER_CMD build -t "bird:$IMG_NAME" "misc/docker/$IMG_NAME"
+  - $DOCKER_CMD pull `sed -ne 's/^FROM //p' "gitlab/docker/$IMG_NAME/Dockerfile"`
+  - $DOCKER_CMD build -t "bird:$IMG_NAME" "gitlab/docker/$IMG_NAME"
   - $DOCKER_CMD tag "bird:$IMG_NAME" "$IMG_BASE:$IMG_NAME"
   - $DOCKER_CMD push "$IMG_BASE:$IMG_NAME"
   after_script:
diff --git a/misc/docker/README.md b/misc/docker/README.md
deleted file mode 100644 (file)
index 9553a90..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# Docker files for our test machinery
-
-**These files are not distribution files for running BIRD. We currently
-do not supply official BIRD images and do not prepare any Docker files ourselves.**
-
-We build for the major Linux distributions, FreeBSD and OpenBSD. If you feel
-that your favourite Linux distribution is missing, please send a patch.
-
-Where to add your favourite Linux distribution:
-
-- add an appropriate dockerfile here
-- possibly add `pkg-*` and `install-*` template job in `misc/gitlab/template.yml.j2`
-- add your distribution into the `distros` list in `misc/gitlab/data.yml.j2`
-- run `make gitlab-local` or `make gitlab-venv` to rebuild `.gitlab-ci.yml`
-
-Rebuilding the docker images is done by triggering the appropriate pipeline manually in Gitlab.
-
-## Debian-based distributions
-
-We support Debian between oldoldstable and testing. If not, poke us.
-
-We support Ubuntu LTS at least 5 years old and non-LTS before EOL. After EOL,
-the non-LTS package repositories tend to disappear quite quickly so we don't
-have resources to build against.
-
-## RedHat-based distributions
-
-We support OpenSUSE, Fedora, CentOS 7+8, Rocky Linux and Oracle Linux. If you are
-missing your favourite new release, poke us. We are discontinuing the old
-releases as they stop working.
-
-The current support for CentOS 7 and 8 has been paid for and we may drop it without
-further notice at the exact moment the customer stops using it.
-
-We failed to find a reliable Docker image for Rocky Linux 10.
-
-## Any other based distributions
-
-We currently don't package for e.g. Alpine, Arch, Gentoo, Mint or Slackware.
-Contributions are open, please refer to `CONTRIBUTING.md` for further information.
-
-## FreeBSD and OpenBSD
-
-These are not built in Docker but in proper virtuals in QEMU, refer to
-<https://gitlab.nic.cz/labs/bird-tools/-/tree/master/birdlab-tmp>