Skip to content

Commit c0f5396

Browse files
committed
BIRD 3.1.2
1 parent 9b524f2 commit c0f5396

5 files changed

Lines changed: 37 additions & 5 deletions

File tree

.github/workflows/cicd.yml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
7878
docker pull pierky/bird:1.6.8
7979
docker pull pierky/bird:2.17.1
80-
docker pull pierky/bird:3.0-alpha2
80+
docker pull pierky/bird:3.1.2
8181
docker pull pierky/openbgpd:8.4
8282
docker pull pierky/openbgpd:8.7
8383
docker pull pierky/exabgp:4.2.7
@@ -207,6 +207,36 @@ jobs:
207207
-d \
208208
-p
209209
210+
- name: Build configuration for BIRD 3 (+ HTML representation)
211+
run: >
212+
docker run \
213+
-t \
214+
--rm \
215+
-v $(pwd)/config.d/clients.yml:/root/clients.yml:ro \
216+
-v ~/arouteserver_configs:/root/arouteserver_configs \
217+
-v ~/arouteserver_html:/root/arouteserver_html \
218+
-e RS_ASN=65500 \
219+
-e ROUTER_ID=192.0.2.123 \
220+
-e LOCAL_PREFIXES=192.0.2.0/24,2001:db8::/32 \
221+
-e DAEMON=bird \
222+
-e VERSION=3.1.2 \
223+
-e SECRET_PEERINGDB_API_KEY="${SECRET_PEERINGDB_API_KEY}" \
224+
pierky/arouteserver:${{ matrix.docker-image.target_image }}
225+
env:
226+
SECRET_PEERINGDB_API_KEY: ${{ secrets.SECRET_PEERINGDB_API_KEY }}
227+
228+
- name: Validate BIRD 3 configuration
229+
run: >
230+
docker run \
231+
-t \
232+
--rm \
233+
-v ~/arouteserver_configs/bird.cfg:/etc/bird/bird.cfg \
234+
pierky/bird:3.1.2 \
235+
bird \
236+
-c /etc/bird/bird.cfg \
237+
-d \
238+
-p
239+
210240
- name: Validate HTML representation
211241
run: >
212242
grep \

CHANGES.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ next release
88

99
- New: add support for `BIRD 2.17.1 <https://bird.nic.cz/news/2025-05-05-new-release-2.17.1/>`__.
1010

11+
- New: add support for `BIRD 3.1.2 <https://www.mail-archive.com/[email protected]/msg08674.html>`__.
12+
1113
1.23.2
1214
------
1315

pierky/arouteserver/builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@ class BIRDConfigBuilder(ConfigBuilder):
891891
"2.0.7", "2.0.7+b962967e", "2.0.8", "2.0.9",
892892
"2.0.10", "2.0.11", "2.13", "2.14", "2.15",
893893
"2.16", "2.17.1",
894-
"3.0"]
894+
"3.0", "3.1.2"]
895895
DEFAULT_VERSION = "2.17.1"
896896

897897
def validate_bgpspeaker_specific_configuration(self):

pierky/arouteserver/tests/live_tests/bird.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,11 +345,11 @@ def _birdcl(self, cmd):
345345

346346
class BIRD3Instance(BIRDInstance):
347347

348-
DOCKER_IMAGE = "pierky/bird:3.0-alpha2"
348+
DOCKER_IMAGE = "pierky/bird:3.1.2"
349349

350350
TAG = "bird3"
351351

352-
TARGET_VERSION = "3.0"
352+
TARGET_VERSION = "3.1.2"
353353

354354
def _get_start_cmd(self):
355355
return "bird -c /etc/bird/bird.conf -d"

utils/update_tests

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ echo "Pulling Docker images needed for the tests..."
111111
# To be kept in sync with .github/workflows/cicd.yml
112112
docker pull pierky/bird:1.6.8
113113
docker pull pierky/bird:2.17.1
114-
docker pull pierky/bird:3.0-alpha2
114+
docker pull pierky/bird:3.1.2
115115
docker pull pierky/openbgpd:8.4
116116
docker pull pierky/openbgpd:8.7
117117
docker pull pierky/exabgp:4.2.7

0 commit comments

Comments
 (0)