diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6753e8f6..59add088 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -154,9 +154,9 @@ docker_ubuntu-20_04-amd64: IMG_NAME: "ubuntu-20.04-amd64" <<: *docker_build -docker_ubuntu-20_10-amd64: +docker_ubuntu-21_10-amd64: variables: - IMG_NAME: "ubuntu-20.10-amd64" + IMG_NAME: "ubuntu-21.10-amd64" <<: *docker_build # GPG error @@ -318,9 +318,9 @@ build-ubuntu-20_04-amd64: <<: *build-linux image: registry.nic.cz/labs/bird:ubuntu-20.04-amd64 -build-ubuntu-20_10-amd64: +build-ubuntu-21_10-amd64: <<: *build-linux - image: registry.nic.cz/labs/bird:ubuntu-20.10-amd64 + image: registry.nic.cz/labs/bird:ubuntu-21.10-amd64 #build-ubuntu-21_04-amd64: # <<: *build-linux @@ -465,10 +465,11 @@ pkg-ubuntu-20.04-amd64: needs: [build-ubuntu-20_04-amd64] image: registry.nic.cz/labs/bird:ubuntu-20.04-amd64 -pkg-ubuntu-20.10-amd64: + +pkg-ubuntu-21.10-amd64: <<: *pkg-deb - needs: [build-ubuntu-20_10-amd64] - image: registry.nic.cz/labs/bird:ubuntu-20.10-amd64 + needs: [build-ubuntu-21_10-amd64] + image: registry.nic.cz/labs/bird:ubuntu-21.10-amd64 #pkg-ubuntu-21.04-amd64: # <<: *pkg-deb diff --git a/doc/bird.sgml b/doc/bird.sgml index 99aa140a..c44b49db 100644 --- a/doc/bird.sgml +++ b/doc/bird.sgml @@ -2419,6 +2419,12 @@ using the following configuration parameters: same address family and using the same local port) should have set