From 58e9ba2724a7b8e07cdd4d2915119ee11d02f830 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Mon, 16 May 2022 15:09:21 -0700
Subject: [PATCH] buildkite: don't run docker tests on COS

On COS, buildkite agents are running inside docker containers and so
we can't modify a docker config and restart a docker daemon.

PiperOrigin-RevId: 449063929
---
 .buildkite/hooks/pre-command |  3 +++
 .buildkite/pipeline.yaml     | 29 +++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
index 8dcd0f75c..e86e8b4a6 100644
--- a/.buildkite/hooks/pre-command
+++ b/.buildkite/hooks/pre-command
@@ -39,6 +39,9 @@ fi
 # Clear existing profiles.
 sudo rm -rf /tmp/profile
 
+# Allow to read dmesg for all users. It is required for the syslog test.
+sudo sysctl -w kernel.dmesg_restrict=0
+
 # Download credentials, if a release agent.
 if test "${BUILDKITE_AGENT_META_DATA_QUEUE}" = "release"; then
   # Pull down secrets.
diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index f6fac3a5b..ce1649711 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -177,27 +177,32 @@ steps:
     agents:
       arch: "amd64"
       cgroup: "v1"
+      os: "ubuntu"
   - <<: *common
     label: ":docker: Docker tests (cgroupv2)"
     command: make docker-tests
     agents:
       arch: "amd64"
       cgroup: "v2"
+      os: "ubuntu"
   - <<: *common
     label: ":goggles: Overlay tests"
     command: make overlay-tests
     agents:
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":safety_pin: Host network tests"
     command: make hostnet-tests
     agents:
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":satellite: SWGSO tests"
     command: make swgso-tests
     agents:
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":coffee: Do tests"
     command: make do-tests
@@ -208,45 +213,53 @@ steps:
     command: make kvm-tests
     agents:
       arch: "amd64"
+      kvm: "true"
   - <<: *common
     label: ":weight_lifter: Fsstress test"
     command: make fsstress-test
     agents:
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":docker: Containerd 1.3.9 tests"
     command: make containerd-test-1.3.9
     agents:
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":docker: Containerd 1.4.3 tests"
     command: make containerd-test-1.4.3
     agents:
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":docker: Containerd 1.5.4 tests (cgroupv1)"
     command: make containerd-test-1.5.4
     agents:
       cgroup: "v1"
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":docker: Containerd 1.5.4 tests (cgroupv2)"
     command: make containerd-test-1.5.4
     agents:
       cgroup: "v2"
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":docker: Containerd 1.6.0-rc.4 tests (cgroupv1)"
     command: make containerd-test-1.6.0-rc.4
     agents:
       cgroup: "v1"
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":docker: Containerd 1.6.0-rc.4 tests (cgroupv2)"
     command: make containerd-test-1.6.0-rc.4
     agents:
       cgroup: "v2"
       arch: "amd64"
+      os: "ubuntu"
 
   # Check the website builds.
   - <<: *common
@@ -257,12 +270,18 @@ steps:
   - <<: *common
     label: ":table_tennis_paddle_and_ball: IPTables tests"
     command: make iptables-tests
+    agents:
+      os: "ubuntu"
   - <<: *common
     label: ":construction_worker: Packetdrill tests"
     command: make packetdrill-tests
+    agents:
+      os: "ubuntu"
   - <<: *common
     label: ":hammer: Packetimpact tests"
     command: make packetimpact-tests
+    agents:
+      os: "ubuntu"
 
   # Runtime tests.
   - <<: *common
@@ -271,30 +290,35 @@ steps:
     parallelism: 10
     agents:
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":java: Java runtime tests"
     command: make RUNTIME_LOG_DIR=/tmp/$${BUILDKITE_JOB_ID} java17-runtime-tests
     parallelism: 40
     agents:
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":golang: Go runtime tests"
     command: make RUNTIME_LOG_DIR=/tmp/$${BUILDKITE_JOB_ID} go1.16-runtime-tests
     parallelism: 10
     agents:
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":node: NodeJS runtime tests"
     command: make RUNTIME_LOG_DIR=/tmp/$${BUILDKITE_JOB_ID} nodejs16.13.2-runtime-tests
     parallelism: 10
     agents:
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":python: Python runtime tests"
     command: make RUNTIME_LOG_DIR=/tmp/$${BUILDKITE_JOB_ID} python3.10.2-runtime-tests
     parallelism: 10
     agents:
       arch: "amd64"
+      os: "ubuntu"
 
   # Runtime tests (LISAFS).
   - <<: *common
@@ -304,6 +328,7 @@ steps:
     if: build.message =~ /lisafs/ || build.branch == "master"
     agents:
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":java: Java runtime tests (LISAFS)"
     command: make RUNTIME_LOG_DIR=/tmp/$${BUILDKITE_JOB_ID} java17-runtime-tests_lisafs
@@ -311,6 +336,7 @@ steps:
     if: build.message =~ /lisafs/ || build.branch == "master"
     agents:
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":golang: Go runtime tests (LISAFS)"
     command: make RUNTIME_LOG_DIR=/tmp/$${BUILDKITE_JOB_ID} go1.16-runtime-tests_lisafs
@@ -318,6 +344,7 @@ steps:
     if: build.message =~ /lisafs/ || build.branch == "master"
     agents:
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":node: NodeJS runtime tests (LISAFS)"
     command: make RUNTIME_LOG_DIR=/tmp/$${BUILDKITE_JOB_ID} nodejs16.13.2-runtime-tests_lisafs
@@ -325,6 +352,7 @@ steps:
     if: build.message =~ /lisafs/ || build.branch == "master"
     agents:
       arch: "amd64"
+      os: "ubuntu"
   - <<: *common
     label: ":python: Python runtime tests (LISAFS)"
     command: make RUNTIME_LOG_DIR=/tmp/$${BUILDKITE_JOB_ID} python3.10.2-runtime-tests_lisafs
@@ -332,6 +360,7 @@ steps:
     if: build.message =~ /lisafs/ || build.branch == "master"
     agents:
       arch: "amd64"
+      os: "ubuntu"
 
   # Build everything.
   - <<: *common