From 57c9591c95af3e65163328c70a0b07d7d9a5e99e Mon Sep 17 00:00:00 2001
From: Matthias Frei <matzf@scion.org>
Date: Mon, 25 Sep 2023 16:39:43 +0200
Subject: [PATCH] ci: fixes for updated buildkite elastic stack version

---
 acceptance/router_multi/test.py |  4 ++++
 demo/file_transfer/tc_setup.sh  |  2 +-
 doc/dev/testing/buildkite.rst   | 11 ++++++-----
 tools/env/rhel/pkgs.txt         |  4 +---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/acceptance/router_multi/test.py b/acceptance/router_multi/test.py
index fe18bbdc71..4497384497 100644
--- a/acceptance/router_multi/test.py
+++ b/acceptance/router_multi/test.py
@@ -118,6 +118,10 @@ def teardown(self):
         sudo("chown -R %s %s" % (cmd.whoami(), self.artifacts))
 
     def create_veths(self, ns: str):
+        # Set default TTL for outgoing packets to the common value 64, so that packets sent
+        # from router will match the expected value.
+        sudo("ip netns exec %s sysctl -w net.ipv4.ip_default_ttl=64" % ns)
+
         create_veth("veth_int_host", "veth_int", "192.168.0.11/24", "f0:0d:ca:fe:00:01", ns,
                     ["192.168.0.12", "192.168.0.13", "192.168.0.14", "192.168.0.51", "192.168.0.61",
                         "192.168.0.71"])
diff --git a/demo/file_transfer/tc_setup.sh b/demo/file_transfer/tc_setup.sh
index 9785adecfd..730ee9c86d 100755
--- a/demo/file_transfer/tc_setup.sh
+++ b/demo/file_transfer/tc_setup.sh
@@ -4,7 +4,7 @@ set -ex
 NETWORK=$1
 RATE=$2
 
-veths=$(brctl show $NETWORK | awk 'NR>1''{print $NF}')
+veths=$(bridge link show | awk "/$NETWORK/{print \$2}")
 for veth in $veths
 do
     echo $veth
diff --git a/doc/dev/testing/buildkite.rst b/doc/dev/testing/buildkite.rst
index a83f194624..c7cd1f1bd7 100644
--- a/doc/dev/testing/buildkite.rst
+++ b/doc/dev/testing/buildkite.rst
@@ -44,12 +44,13 @@ Agents
 Machine Image
 -------------
 
-We use the default machine image of the *Elastic CI Stack for AWS*. `What's on each machine <https://buildkite.com/docs/agent/v3/elastic-ci-aws#whats-on-each-machine>`_:
+We use the default machine image of the *Elastic CI Stack for AWS* release `v6.7.1 <https://github.com/buildkite/elastic-ci-stack-for-aws/releases/tag/v6.7.1>`.
+`What's on each machine <https://buildkite.com/docs/agent/v3/elastic-ci-aws#before-you-start-whats-on-each-machine>`_:
 
-- Amazon Linux 2
-- Buildkite Agent v3.39.1
-- Docker v20.10.7
-- Docker Compose v1.29.2
+- Amazon Linux 2023
+- Buildkite Agent v3.50.2
+- Docker v20.10.25
+- Docker Compose v2.20.3
 - AWS CLI
 - jq
 
diff --git a/tools/env/rhel/pkgs.txt b/tools/env/rhel/pkgs.txt
index 737fe222c4..406131757f 100644
--- a/tools/env/rhel/pkgs.txt
+++ b/tools/env/rhel/pkgs.txt
@@ -1,10 +1,8 @@
-bridge-utils
-moreutils
+ethtool
 gcc
 g++
 python3-pip
 python3-setuptools
 python3-wheel
 jq
-sqlite3
 openssl