Merge pull request #654 from redhatci/certsuite-collector-vars

certsuite | add optional variables for feeding the collector DB when submitting results

Author: ramperher

roles/k8s_best_practices_certsuite/README.md

@@ -35,6 +35,8 @@ kbpc_log_path                           | undefined
 kbpc_code_src_dir                       | undefined                                                                                                                                                                                                                               | If testing a certsuite PR, this variable will be injected from test-runner scripts (used in dci-pipeline and dci-openshift-agent projects) to refer to the file path where the code from the PR is placed in the jumphost, so that it can be used in this role to build a new certsuite container image based on that code.
 kbpc_cwe_apikey_path                    | /opt/cache/cwe-apikey.txt                                                                                                                                                                                                                                     | (Starting from Certsuite v5.4.2) Path to the file containing CWE Hydra API key. It must be generated in Connect UI and saved in this file beforehand.
 kbpc_cwe_project_id                     | undefined                                                                                                                                                                                                                               | (Starting from Certsuite v5.4.2) Best Practices CNF project ID in Connect UI. Must be retrieved from Connect UI or from the DCI job that created the CNF project.
+kbpc_partner_name                       |  ""                                                                                                                                                                                                                                      | Partner name used for feeding the collector DB when submitting a result. This is optional.
+kbpc_collector_app_password             |  ""                                                                                                                                                                                                                                      | Password used for feeding the collector DB when submitting a result. This is optional.
 
 ## How to call the role
 

roles/k8s_best_practices_certsuite/defaults/main.yml

@@ -18,6 +18,9 @@ kbpc_allow_preflight_insecure: false
 # It must be created manually in Connect UI
 # Do not forget to define kbpc_cwe_project_id as well
 kbpc_cwe_apikey_path: "/opt/cache/cwe-apikey.txt"
+# Variables to feed the collector DB when submitting a result with a unique user and pass
+kbpc_partner_name: ""
+kbpc_collector_app_password: ""
 # If this is not set to true, JUnit file will not be created
 kbpc_enable_xml_creation: true
 ## This variable is deprecated, to be deleted when updating backwards compatibility support

roles/k8s_best_practices_certsuite/templates/certsuite_config.yml.j2

@@ -64,6 +64,11 @@ connectAPIConfig:
   proxyPort: ""
 {% endif %}
 
+## collector DB
+{% if kbpc_partner_name|length == 0 %}#{% endif %}partnerName: {{ kbpc_partner_name }}
+
+{% if kbpc_collector_app_password|length == 0 %}#{% endif %}collectorAppPassword: {{ kbpc_collector_app_password }}
+
 ## fields below are not currently used, leaving placeholder in case they were needed in the future
 #managedDeployments:
 
@@ -81,7 +86,4 @@ connectAPIConfig:
 
 #executedBy: ""
 
-#partnerName: ""
-
-#collectorAppPassword: ""
 ...