From 0712027eb1ba414ed85cc73984d017cf4a072a29 Mon Sep 17 00:00:00 2001 From: Ravi kumar Veeramally Date: Tue, 13 Jun 2023 23:31:41 +0300 Subject: [PATCH] ci: Move CI related test data to separate folder Script `create-cloud-init.sh" uses the same cloud init data as the the CI but this means it is somewhat overloaded with unhelpful network configuration entries and scripts that are only needed for the CI. CI related data moved to test_data/cloud-init/ubuntu/ci folder. Fixes: #4773 Signed-off-by: Ravi kumar Veeramally --- test_data/cloud-init/ubuntu/{ => ci}/meta-data | 0 test_data/cloud-init/ubuntu/{ => ci}/network-config | 0 test_data/cloud-init/ubuntu/{ => ci}/user-data | 0 test_infra/src/lib.rs | 3 ++- 4 files changed, 2 insertions(+), 1 deletion(-) rename test_data/cloud-init/ubuntu/{ => ci}/meta-data (100%) rename test_data/cloud-init/ubuntu/{ => ci}/network-config (100%) rename test_data/cloud-init/ubuntu/{ => ci}/user-data (100%) diff --git a/test_data/cloud-init/ubuntu/meta-data b/test_data/cloud-init/ubuntu/ci/meta-data similarity index 100% rename from test_data/cloud-init/ubuntu/meta-data rename to test_data/cloud-init/ubuntu/ci/meta-data diff --git a/test_data/cloud-init/ubuntu/network-config b/test_data/cloud-init/ubuntu/ci/network-config similarity index 100% rename from test_data/cloud-init/ubuntu/network-config rename to test_data/cloud-init/ubuntu/ci/network-config diff --git a/test_data/cloud-init/ubuntu/user-data b/test_data/cloud-init/ubuntu/ci/user-data similarity index 100% rename from test_data/cloud-init/ubuntu/user-data rename to test_data/cloud-init/ubuntu/ci/user-data diff --git a/test_infra/src/lib.rs b/test_infra/src/lib.rs index 276bb2803..63a28a30b 100644 --- a/test_infra/src/lib.rs +++ b/test_infra/src/lib.rs @@ -249,7 +249,8 @@ impl DiskConfig for UbuntuDiskConfig { .unwrap() .join("test_data") .join("cloud-init") - .join("ubuntu"); + .join("ubuntu") + .join("ci"); vec!["meta-data"].iter().for_each(|x| { rate_limited_copy(source_file_dir.join(x), cloud_init_directory.join(x))