From 83cec26a5a7e745f5ea7fe635badb24ea77b42ea Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@redhat.com>
Date: Mon, 12 Jun 2023 13:21:53 +0300
Subject: [PATCH] Remove cloud-init/network-config file from tests

- not used in oscap.sh test at all
- causes VM in libvirt.sh test to acquire a different IP address instead
  of the hard-coded one inside the test, which causes SSH to fail

- not used anywhere else
---
 test/cases/oscap.sh                 |  1 -
 test/data/cloud-init/network-config | 14 --------------
 tools/libvirt_test.sh               |  3 +--
 3 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 test/data/cloud-init/network-config

diff --git a/test/cases/oscap.sh b/test/cases/oscap.sh
index d4c67d404..a25aa8630 100755
--- a/test/cases/oscap.sh
+++ b/test/cases/oscap.sh
@@ -106,7 +106,6 @@ EOF
 CLOUD_INIT_DIR=$(mktemp -d)
 cp "${OSBUILD_COMPOSER_TEST_DATA}"/cloud-init/meta-data "${CLOUD_INIT_DIR}"/
 cp "${USER_DATA_FILE}" "${CLOUD_INIT_DIR}"/
-# cp "${OSBUILD_COMPOSER_TEST_DATA}"/cloud-init/network-config "${CLOUD_INIT_DIR}"/
 
 # Set up a cloud-init ISO.
 gen_iso () {
diff --git a/test/data/cloud-init/network-config b/test/data/cloud-init/network-config
deleted file mode 100644
index 399dcf8a1..000000000
--- a/test/data/cloud-init/network-config
+++ /dev/null
@@ -1,14 +0,0 @@
-network:
-  version: 2
-  renderer: NetworkManager
-  ethernets:
-    eth0:
-      dhcpv4: false
-      dhcpv6: false
-      addresses:
-        - 192.168.122.50/24
-      gateway4: 192.168.122.1
-      nameservers:
-        addresses:
-          - 1.1.1.1
-          - 8.8.8.8
\ No newline at end of file
diff --git a/tools/libvirt_test.sh b/tools/libvirt_test.sh
index 68b624700..a170cd8ce 100755
--- a/tools/libvirt_test.sh
+++ b/tools/libvirt_test.sh
@@ -227,7 +227,6 @@ fi
 CLOUD_INIT_DIR=$(mktemp -d)
 cp "${OSBUILD_COMPOSER_TEST_DATA}"/cloud-init/meta-data "${CLOUD_INIT_DIR}"/
 cp "${SSH_DATA_DIR}"/user-data "${CLOUD_INIT_DIR}"/
-cp "${OSBUILD_COMPOSER_TEST_DATA}"/cloud-init/network-config "${CLOUD_INIT_DIR}"/
 
 # Set up a cloud-init ISO.
 greenprint "💿 Creating a cloud-init ISO"
@@ -235,7 +234,7 @@ CLOUD_INIT_PATH=/var/lib/libvirt/images/seed.iso
 rm -f $CLOUD_INIT_PATH
 pushd "$CLOUD_INIT_DIR"
     sudo mkisofs -o $CLOUD_INIT_PATH -V cidata \
-        -r -J user-data meta-data network-config > /dev/null 2>&1
+        -r -J user-data meta-data > /dev/null 2>&1
 popd
 
 # Ensure SELinux is happy with our new images.