Merge branch 'master' into efoley/common_fix_file_test

infrawatch · Jan 30, 2025 · d8400d4 · d8400d4
2 parents b2e621e + 70857ad
commit d8400d4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ci/vars-functional-test.yml b/ci/vars-functional-test.yml
@@ -1,5 +1,9 @@
 ---
-# temp: skip os-net-setup
+# This is added so we skip the os_net_setup role, which would normally be used
+# to create a network.
+# A network gets created by `make edpm_deploy_instance` during the autoscaling
+# tests.
+# skip os-net-setup
 cifmw_os_net_setup_config: []
 post_deploy_00_run_functional_test:
   source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/run_autoscaling_osp18.yml"