bird: minor fixes (fedora 31)

.gitlab-ci.yml

@@ -46,15 +46,15 @@ stages:
 #     IMG_NAME: "debian-9-amd64"
 #   <<: *docker_build
 
-docker_debian-10-amd64:
+# docker_debian-10-amd64:
-  variables:
+#   variables:
-    IMG_NAME: "debian-10-amd64"
+#     IMG_NAME: "debian-10-amd64"
-  <<: *docker_build
+#   <<: *docker_build
 
-docker_debian-testing-amd64:
+# docker_debian-testing-amd64:
-  variables:
+#   variables:
-    IMG_NAME: "debian-testing-amd64"
+#     IMG_NAME: "debian-testing-amd64"
-  <<: *docker_build
+#   <<: *docker_build
 
 # docker_debian-7-i386:
 #   variables:
@@ -71,15 +71,15 @@ docker_debian-testing-amd64:
 #     IMG_NAME: "debian-9-i386"
 #   <<: *docker_build
 
-docker_debian-10-i386:
+# docker_debian-10-i386:
-  variables:
+#   variables:
-    IMG_NAME: "debian-10-i386"
+#     IMG_NAME: "debian-10-i386"
-  <<: *docker_build
+#   <<: *docker_build
 
-docker_debian-testing-i386:
+# docker_debian-testing-i386:
-  variables:
+#   variables:
-    IMG_NAME: "debian-testing-i386"
+#     IMG_NAME: "debian-testing-i386"
-  <<: *docker_build
+#   <<: *docker_build
 
 # docker_fedora-25-amd64:
 #   variables:
@@ -121,15 +121,15 @@ docker_fedora-31-amd64:
 #     IMG_NAME: "centos-7-amd64"
 #   <<: *docker_build
 
-docker_centos-8-amd64:
+# docker_centos-8-amd64:
-  variables:
+#   variables:
-    IMG_NAME: "centos-8-amd64"
+#     IMG_NAME: "centos-8-amd64"
-  <<: *docker_build
+#   <<: *docker_build
 
-docker_opensuse-42_3-amd64:
+# docker_opensuse-42_3-amd64:
-  variables:
+#   variables:
-    IMG_NAME: "opensuse-42.3-amd64"
+#     IMG_NAME: "opensuse-42.3-amd64"
-  <<: *docker_build
+#   <<: *docker_build
 
 # docker_ubuntu-14_04-amd64:
 #   variables:
@@ -146,25 +146,25 @@ docker_opensuse-42_3-amd64:
 #     IMG_NAME: "ubuntu-18.04-amd64"
 #   <<: *docker_build
  
-docker_ubuntu-19_04-amd64:
+# docker_ubuntu-19_04-amd64:
-  variables:
+#   variables:
-    IMG_NAME: "ubuntu-19.04-amd64"
+#     IMG_NAME: "ubuntu-19.04-amd64"
-  <<: *docker_build
+#   <<: *docker_build
 
 # TODO We want to copy these BSDs to our own virtual machines, to make sure someone doesn't update them by accident.
-.freebsd-11-i386: &freebsd-11-i386_env
+# .freebsd-11-i386: &freebsd-11-i386_env
-  tags:
+#   tags:
-  - freebsd
+#   - freebsd
-  - i386
+#   - i386
   #only:
   #- master
   #- triggers
   #- tags
 
-.freebsd-11-amd64: &freebsd-11-amd64_env
+# .freebsd-11-amd64: &freebsd-11-amd64_env
-  tags:
+#   tags:
-  - freebsd
+#   - freebsd
-  - amd64
+#   - amd64
 
 .build: &build-base
   stage: build
@@ -182,6 +182,10 @@ docker_ubuntu-19_04-amd64:
   stage: build
   script:
     - dnf -y install make
+  tags:
+    - docker
+    - linux
+    - amd64
 
 .build-linux: &build-linux
   <<: *build-base
@@ -214,21 +218,21 @@ docker_ubuntu-19_04-amd64:
 #   <<: *build-linux
 #   image: registry.labs.nic.cz/labs/bird:debian-9-i386
 
-build-debian-10-amd64:
+# build-debian-10-amd64:
-  <<: *build-linux
+#   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:debian-10-amd64
+#   image: registry.labs.nic.cz/labs/bird:debian-10-amd64
 
-build-debian-10-i386:
+# build-debian-10-i386:
-  <<: *build-linux
+#   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:debian-10-i386
+#   image: registry.labs.nic.cz/labs/bird:debian-10-i386
 
-build-debian-testing-amd64:
+# build-debian-testing-amd64:
-  <<: *build-linux
+#   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:debian-testing-amd64
+#   image: registry.labs.nic.cz/labs/bird:debian-testing-amd64
 
-build-debian-testing-i386:
+# build-debian-testing-i386:
-  <<: *build-linux
+#   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:debian-testing-i386
+#   image: registry.labs.nic.cz/labs/bird:debian-testing-i386
 
 # build-fedora-25-amd64:
 #   <<: *preprocessing-fedora
@@ -269,13 +273,13 @@ build-fedora-31-amd64:
 #   <<: *build-linux
 #   image: registry.labs.nic.cz/labs/bird:centos-7-amd64
 
-build-centos-8-amd64:
+# build-centos-8-amd64:
-  <<: *build-linux
+#   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:centos-8-amd64
+#   image: registry.labs.nic.cz/labs/bird:centos-8-amd64
 
-build-opensuse-42_3-amd64:
+# build-opensuse-42_3-amd64:
-  <<: *build-linux
+#   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:opensuse-42.3-amd64
+#   image: registry.labs.nic.cz/labs/bird:opensuse-42.3-amd64
 
 # build-ubuntu-14_04-amd64:
 #   <<: *build-linux
@@ -289,21 +293,21 @@ build-opensuse-42_3-amd64:
 #   <<: *build-linux
 #   image: registry.labs.nic.cz/labs/bird:ubuntu-18.04-amd64
 
-build-ubuntu-19_04-amd64:
+# build-ubuntu-19_04-amd64:
-  <<: *build-linux
+#   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:ubuntu-19.04-amd64
+#   image: registry.labs.nic.cz/labs/bird:ubuntu-19.04-amd64
 
-build-freebsd-11-amd64:
+# build-freebsd-11-amd64:
-  <<: *build-base
+#   <<: *build-base
-  tags:
+#   tags:
-    - freebsd
+#     - freebsd
-    - amd64
+#     - amd64
 
-build-freebsd-11-i386:
+# build-freebsd-11-i386:
-  <<: *build-base
+#   <<: *build-base
-  tags:
+#   tags:
-    - freebsd
+#     - freebsd
-    - i386
+#     - i386
 
 # build-birdlab:
 #   stage: build
@@ -320,7 +324,6 @@ build-freebsd-11-i386:
 #     - git pull --ff-only
 #     - mv $DIR/bird $DIR/birdc netlab/common
 
-
 # .test: &test-base
 #   stage: test
 #   needs: [build-birdlab]