From b70e7964e121b8dc4fd5ffa2fb4456dfab99eb21 Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichels@redhat.com>
Date: Thu, 22 Sep 2022 13:29:19 -0400
Subject: [PATCH] ci: Fix low-scale CI.

The low-scale CI scenario needed updating.

* It tried to use "localhost" as the host, which is no longer possible.
  The orchestrator and the ovn-tester container both need to be able to
  access the same hosts using the physical deployment file.
* It was missing a tester section.
---
 .cirrus.yml                        | 10 +++++++---
 physical-deployments/ci.yml        | 12 ++++++++++++
 physical-deployments/localhost.yml |  8 --------
 3 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 physical-deployments/ci.yml
 delete mode 100644 physical-deployments/localhost.yml

diff --git a/.cirrus.yml b/.cirrus.yml
index 9dbf04d0..31560176 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -5,21 +5,23 @@ low_scale_task:
     image: family/fedora-cloud-35
     platform: linux
     memory: 8G
+    use_static_ip: true
 
   env:
     DEPENDENCIES: git ansible podman podman-docker
-    PHYS_DEPLOYMENT: ${CIRRUS_WORKING_DIR}/physical-deployments/localhost.yml
+    PHYS_DEPLOYMENT: ${CIRRUS_WORKING_DIR}/physical-deployments/ci.yml
 
   runtime_cache:
     folder: runtime-cache
 
   configure_ssh_script:
+    - export IP_ADDR=$(ip route get 8.8.8.8 | head -1 | sed 's/.*src \([0-9\.]*\).*/\1/')
     - mkdir -p /root/.ssh/
     - ssh-keygen -t rsa -N '' -q -f /root/.ssh/id_rsa
-    - ssh-keyscan localhost >> /root/.ssh/known_hosts
+    - ssh-keyscan ${IP_ADDR} >> /root/.ssh/known_hosts
     - cat /root/.ssh/id_rsa.pub >> /root/.ssh/authorized_keys
     - chmod og-wx /root/.ssh/authorized_keys
-    - ssh root@localhost -v echo Hello
+    - ssh root@${IP_ADDR} -v echo Hello
 
   install_dependencies_script:
     - dnf install -y ${DEPENDENCIES}
@@ -30,6 +32,8 @@ low_scale_task:
     - tar -xzf runtime-cache/runtime.tar.gz || true
 
   install_script:
+    - export IP_ADDR=$(ip route get 8.8.8.8 | head -1 | sed 's/.*src \([0-9\.]*\).*/\1/')
+    - 'sed -i "s/<ip>/${IP_ADDR}/g" ${PHYS_DEPLOYMENT}'
     - ./do.sh install
 
   pack_caches_script:
diff --git a/physical-deployments/ci.yml b/physical-deployments/ci.yml
new file mode 100644
index 00000000..9d67bbe0
--- /dev/null
+++ b/physical-deployments/ci.yml
@@ -0,0 +1,12 @@
+registry-node: <ip>
+internal-iface: eno1
+
+central-node:
+  name: <ip>
+
+tester-node:
+  name: <ip>
+  ssh_key: /root/.ssh/id_rsa
+
+worker-nodes:
+  - <ip>
diff --git a/physical-deployments/localhost.yml b/physical-deployments/localhost.yml
deleted file mode 100644
index a8d0708b..00000000
--- a/physical-deployments/localhost.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-registry-node: localhost
-internal-iface: lo
-
-central-node:
-  name: localhost
-
-worker-nodes:
-  - localhost