Merge pull request #183 from hagertnl/nick-sitecustom-machineini

Updating config file to allow SiteCustom section

configs/example_machine.ini

@@ -5,10 +5,6 @@ scheduler_type = slurm
 joblauncher_type = srun
 cpus_per_node = 16
 gpus_per_node = 1
-batch_queue = batch
-project_id = abc123
-submit_args = 
-nccs_test_harness_module = olcf_harness
 
 [RepoDetails]
 type_of_repository = git
@@ -20,6 +16,10 @@ git_ssh_server_url = [email protected]
 git_https_server_url = https://github.com
 
 [TestshotDefaults]
+batch_queue = batch
+project_id = abc123
+submit_args = 
 path_to_sspace = /home/a_user/other_dir
 system_log_tag = a_label
 
+[SiteCustom]

configs/olcf_examples/frontier.ini

@@ -5,8 +5,6 @@ scheduler_type = slurm
 joblauncher_type = srun
 cpus_per_node = 56
 gpus_per_node = 8
-batch_queue = batch
-submit_args = 
 
 # This section is optional, if you don't have a git repo to connect with.
 # Without connecting to a repo, you will need to manually place your tests as needed.
@@ -20,3 +18,12 @@ git_ssh_server_url = [email protected]
 git_https_server_url = https://github.com
 
 [TestshotDefaults]
+project_id = <myproject>
+batch_queue = batch
+submit_args = 
+path_to_sspace = /path/to/sspace
+system_log_tag = frontier_test
+
+[SiteCustom]
+# Use this for custom environment variables that you may want to use in tests.
+# This is a good place for database environment variables (ie, influxdb_uri, influxdb_token)

configs/olcf_examples/summit.ini

@@ -5,8 +5,6 @@ scheduler_type = lsf
 joblauncher_type = jsrun
 cpus_per_node = 42
 gpus_per_node = 6
-batch_queue = batch
-submit_args = 
 
 # This section is optional, if you don't have a git repo to connect with.
 # Without connecting to a repo, you will need to manually place your tests as needed.
@@ -20,3 +18,12 @@ git_ssh_server_url = [email protected]
 git_https_server_url = https://github.com
 
 [TestshotDefaults]
+project_id = <myprojectid>
+batch_queue = batch
+submit_args =
+path_to_sspace = /path/to/sspace
+system_log_tag = frontier_test
+
+[SiteCustom]
+# Use this for custom environment variables that you may want to use in tests.
+# This is a good place for database environment variables (ie, influxdb_uri, influxdb_token)

harness/libraries/config_file.py

@@ -9,7 +9,7 @@ class rgt_config_file:
     # These are the named sections in the config file.
     machine_section    = 'MachineDetails'
     repository_section = 'RepoDetails'
-    influx_section = 'InfluxDefaults'
+    site_section = 'SiteCustom'
     testshot_section   = 'TestshotDefaults'
 
     def __init__(self,
@@ -18,7 +18,7 @@ def __init__(self,
 
         self.__machine_vars = {}
         self.__repo_vars = {}
-        self.__influx_vars = {}
+        self.__site_vars = {}
         self.__testshot_vars = {}
 
         if machinename != None:
@@ -55,10 +55,10 @@ def __read_config_file(self):
             self.__repo_vars = master_cfg[rgt_config_file.repository_section]
             set_harness_environment(self.__repo_vars)
 
-            # Make Influx section optional, since some users don't use Influx
-            if master_cfg.has_section(rgt_config_file.influx_section):
-                self.__influx_vars = master_cfg[rgt_config_file.influx_section]
-                set_harness_environment(self.__influx_vars)
+            # Site-cutom configuration section is optional
+            if master_cfg.has_section(rgt_config_file.site_section):
+                self.__site_vars = master_cfg[rgt_config_file.site_section]
+                set_harness_environment(self.__site_vars)
 
             self.__testshot_vars = master_cfg[rgt_config_file.testshot_section]
             set_harness_environment(self.__testshot_vars)
@@ -74,8 +74,8 @@ def get_machine_config(self):
     def get_repository_config(self):
         return self.__repo_vars
 
-    def get_influx_config(self):
-        return self.__influx_vars
+    def get_site_config(self):
+        return self.__site_vars
 
     def get_testshot_config(self):
         return self.__testshot_vars