BIRD 2.15, OpenBGPD 8.7

.github/workflows/cicd.yml

@@ -76,10 +76,10 @@ jobs:
         run: |
           echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
           docker pull pierky/bird:1.6.8
-          docker pull pierky/bird:2.15
+          docker pull pierky/bird:2.16
           docker pull pierky/bird:3.0-alpha2
           docker pull pierky/openbgpd:8.0
-          docker pull pierky/openbgpd:8.4
+          docker pull pierky/openbgpd:8.7
           docker pull pierky/exabgp:4.2.7
           docker pull nlnetlabs/routinator:v0.13.2
         env:
@@ -225,7 +225,7 @@ jobs:
             -e ROUTER_ID=192.0.2.124 \
             -e LOCAL_PREFIXES=192.0.2.0/24,2001:db8::/32 \
             -e DAEMON=openbgpd \
-            -e VERSION=8.4 \
+            -e VERSION=8.7 \
             -e SECRET_PEERINGDB_API_KEY="${SECRET_PEERINGDB_API_KEY}" \
             pierky/arouteserver:${{ matrix.docker-image.target_image }}
         env:
@@ -237,7 +237,7 @@ jobs:
             -t \
             --rm \
             -v ~/arouteserver_configs/openbgpd.cfg:/etc/bgpd/bgpd.conf \
-            pierky/openbgpd:8.4 \
+            pierky/openbgpd:8.7 \
             bgpd \
               -f /etc/bgpd/bgpd.conf \
               -d \
@@ -258,7 +258,7 @@ jobs:
             -v $(pwd)/examples/auto-config/bird-general.yml:/etc/arouteserver/general.yml:ro \
             -v ~/arouteserver_configs:/root/arouteserver_configs \
             -e DAEMON=bird \
-            -e VERSION=2.15 \
+            -e VERSION=2.16 \
             -e SECRET_PEERINGDB_API_KEY="${SECRET_PEERINGDB_API_KEY}" \
             pierky/arouteserver:${{ matrix.docker-image.target_image }}
         env:
@@ -270,7 +270,7 @@ jobs:
             -t \
             --rm \
             -v ~/arouteserver_configs/bird.cfg:/etc/bird/bird.cfg \
-            pierky/bird:2.15 \
+            pierky/bird:2.16 \
             bird \
               -c /etc/bird/bird.cfg \
               -d \

CHANGES.rst

@@ -3,6 +3,11 @@ Change log
 
 .. note:: **Upgrade notes**: after upgrading, run the ``arouteserver setup-templates`` command to sync the local templates with those distributed with the new version. More details on the `Upgrading <https://arouteserver.readthedocs.io/en/latest/INSTALLATION.html#upgrading>`__ section of the documentation.
 
+next release
+------------
+
+- New: add support for `BIRD 2.15 <https://bird.network.cz/pipermail/bird-users/2024-March/017517.html>`__ and OpenBGPD 8.7, also added to the integration testing suite.
+
 1.23.1
 ------
 

pierky/arouteserver/builder.py

@@ -890,8 +890,9 @@ class BIRDConfigBuilder(ConfigBuilder):
     AVAILABLE_VERSION = ["1.6.3", "1.6.4", "1.6.6", "1.6.7", "1.6.8",
                          "2.0.7", "2.0.7+b962967e", "2.0.8", "2.0.9",
                          "2.0.10", "2.0.11", "2.13", "2.14", "2.15",
+                         "2.16",
                          "3.0"]
-    DEFAULT_VERSION = "2.15"
+    DEFAULT_VERSION = "2.16"
 
     def validate_bgpspeaker_specific_configuration(self):
         res = True
@@ -1077,7 +1078,7 @@ class OpenBGPDConfigBuilder(ConfigBuilder):
     LOCAL_FILES_BASE_DIR = "/etc/bgpd"
 
     AVAILABLE_VERSION = ["7.0", "7.1", "7.2", "7.3", "7.4", "7.5", "7.6", "7.7",
-                         "7.8", "8.0", "8.3", "8.4"]
+                         "7.8", "8.0", "8.3", "8.4", "8.7"]
     DEFAULT_VERSION = AVAILABLE_VERSION[-1]
 
     IGNORABLE_ISSUES = ConfigBuilder.IGNORABLE_ISSUES + \

pierky/arouteserver/tests/live_tests/bird.py

@@ -331,11 +331,11 @@ def _birdcl(self, cmd):
 
 class BIRD2Instance(BIRDInstance):
 
-    DOCKER_IMAGE = "pierky/bird:2.15"
+    DOCKER_IMAGE = "pierky/bird:2.16"
 
     TAG = "bird2"
 
-    TARGET_VERSION = "2.15"
+    TARGET_VERSION = "2.16"
 
     def _get_start_cmd(self):
         return "bird -c /etc/bird/bird.conf -d"

pierky/arouteserver/tests/live_tests/openbgpd.py

@@ -681,5 +681,15 @@ class OpenBGPD84PortableInstance(OpenBGPDPortableInstance):
     TARGET_VERSION = "8.4"
 
 
-OpenBGPDPortablePreviousInstance = OpenBGPD80PortableInstance
-OpenBGPDPortableLatestInstance = OpenBGPD84PortableInstance
+class OpenBGPD87PortableInstance(OpenBGPDPortableInstance):
+
+    DOCKER_IMAGE = "pierky/openbgpd:8.7"
+
+    TAG = "openbgpd87p"
+
+    BGP_SPEAKER_VERSION = "8.7"
+    TARGET_VERSION = "8.7"
+
+
+OpenBGPDPortablePreviousInstance = OpenBGPD84PortableInstance
+OpenBGPDPortableLatestInstance = OpenBGPD87PortableInstance

utils/update_tests

@@ -110,10 +110,10 @@ fi
 echo "Pulling Docker images needed for the tests..."
 # To be kept in sync with .github/workflows/cicd.yml
 docker pull pierky/bird:1.6.8
-docker pull pierky/bird:2.15
+docker pull pierky/bird:2.16
 docker pull pierky/bird:3.0-alpha2
 docker pull pierky/openbgpd:8.0
-docker pull pierky/openbgpd:8.4
+docker pull pierky/openbgpd:8.7
 docker pull pierky/exabgp:4.2.7
 docker pull nlnetlabs/routinator:v0.13.2