Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: fixes for updated buildkite elastic stack version #4397

Merged
merged 1 commit into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions acceptance/router_multi/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down
2 changes: 1 addition & 1 deletion demo/file_transfer/tc_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions doc/dev/testing/buildkite.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 1 addition & 3 deletions tools/env/rhel/pkgs.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
bridge-utils
moreutils
ethtool
gcc
g++
python3-pip
python3-setuptools
python3-wheel
jq
sqlite3
openssl
Loading