Merge pull request #315 from redhat-performance/turn_on_pcp

Add the option to Zathras to turn on and off pcp in the wrappers.

Author: dvalinrh

ansible_roles/roles/test_generic/tasks/main.yml

@@ -80,6 +80,7 @@
         --sysname "{{ config_info.host_or_cloud_inst }}"
         --sys_type {{ config_info.system_type }}
         {{ "--no_pkg_install" if config_info.do_not_install_packages else "" }}
+        {{ config_info.use_pcp }}
         {{ test_data.test_specific }}
 
   - name: command running

bin/burden

@@ -140,6 +140,7 @@ gl_spot_recover=1
 gl_cloud_placement=${value_not_set}
 gl_cloud_networks_sys="duplicate"
 gl_preflight=0
+gl_use_pcp="--use_pcp"
 #
 # Global values
 #   gl_sys_file: sysctl files to use.
@@ -1929,6 +1930,7 @@ create_ansible_options()
 			echo "  test_exec_location: none"  >> ansible_vars_main.yml
 		fi
 
+		echo "  use_pcp: ${gl_use_pcp}" >> ansible_vars_main.yml
 		#
 		# More differences in the cloud space that has to be addressed here.
 		#
@@ -3329,6 +3331,8 @@ usage()
 	echo "  --no_spot_recover: Do not recover from a spot system going away."
 	echo "  --package_name <name>: Use this set of packages to override the default in the test config."
 	echo "    file instead of the default. Default format  package name <os>_pkg, new name <os>_pkg_<ver>."
+	echo "  --use_pcp 0/1:  If set to 0, pcp will not be used by the wrappers.  If set to 1, pcp will be"
+	echo "    used by the wrappers.  Default is 1."
 	echo "  --persistent_log: enable persistent logging"
 	echo "  --preflight_check: Performs various checks on the scenario file, and Zathras and then exits"
 	echo "  --results_prefix <prefix>: Run directory prefix"
@@ -3757,6 +3761,15 @@ set_general_value()
 			usage "0"
 			shift_by=1
 		;;
+		--use_pcp)
+			echo "$1 $2" >> $gl_cli_supplied_options
+			if [[ $2 -eq 1 ]]; then
+				gl_use_pcp="--use_pcp"
+			else
+				gl_use_pcp=""
+			fi
+			shift_by=2
+		;;
 		--use_spot)
 			gl_use_spot=$2
 			shift_by=2
@@ -3822,6 +3835,7 @@ grab_cli_data()
 		"tuned_reboot"
 		"update_target"
 		"upload_rpms"
+		"use_pcp"
 		"use_spot"
 	)
 

docs/command_line_reference.md

@@ -61,6 +61,9 @@ Currently rhel, ubuntu, amazon, suse.
 ### --package_name \<name>
 Use this set of packages to override the default in the test config file instead of the default. Default format package name \<os>_pkg, new name \<os>_pkg_\<ver>.
 
+### --use_pcp 0/1
+If set to 0, pcp will not be used by the wrappers.  If set to 1, pcp will be used by the wrappers.  Default is 1.
+
 ### --persistent_log
 Enable persistent logging.
 
@@ -187,4 +190,5 @@ Operating mode. Use 'image' for bootc-based hosts (skips packages, uses safe upl
 Name of the user to log into the system with. This setting will override the defaults based on cloud or local system.
 
 ### --update_test_versions
-Will update the templates so we are using the latest versions of the test (git repos only).
+Will update the templates so we are using the latest versions of the test (git repos only).
+