Automation Toolkit Release v2024.2.2

Author: bhlohumi

Dockerfile

@@ -69,4 +69,4 @@ COPY --chown=cd3user:cd3user jenkins_install/plugins.txt ${REF}/plugins.txt
 
 RUN sudo java -jar ${JENKINS_INSTALL}/jenkins-plugin-manager.jar --war ${JENKINS_INSTALL}/jenkins.war --verbose -f ${REF}/plugins.txt && \
     sudo chown -R cd3user:cd3user ${JENKINS_INSTALL} && \
-    sudo chmod +x ${JENKINS_INSTALL}/jenkins.sh
+    sudo chmod +x ${JENKINS_INSTALL}/jenkins.sh

OCIWorkVMStack/scripts/installToolkit.sh

@@ -67,7 +67,7 @@ echo "********************************************************" >> $logfile 2>&1
 echo "########################################################" >> $logfile 2>&1
 echo "Downloading CD3 Automation Toolkit Code from Github " >> $logfile 2>&1
 echo "########################################################" >> $logfile 2>&1
-sudo git clone https://github.com/oracle-devrel/cd3-automation-toolkit.git -b develop $toolkit_dir >> $logfile 2>&1
+sudo git clone https://github.com/oracle-devrel/cd3-automation-toolkit.git -b develop  $toolkit_dir >> $logfile 2>&1
 stop_exec
 sudo ls -la /tmp/githubCode >> $logfile 2>&1
 echo "Downloading CD3 Automation Toolkit Code from Github completed successfully" >> $logfile 2>&1

cd3_automation_toolkit/setUpOCI.py

@@ -1330,6 +1330,12 @@ def execute_showoci(outdir, prefix, config_file_path):
     if not os.path.isfile("/cd3user/oci_tools/oci-python-sdk/examples/showoci/showoci.py"):
         get_latest_showoci(outdir, prefix, config_file=config_file_path)
     cmd = "python /cd3user/oci_tools/oci-python-sdk/examples/showoci/showoci.py -a"
+    if auth_mechanism == "instance_principal":
+        cmd += " -ip"
+    elif auth_mechanism == "session_token":
+        cmd += " -is"
+    else:
+        cmd += " -cf "+config_file_path
     split = str.split(cmd)
     dirname = prefix + "_showoci_report"
     resource = "showoci_report"
@@ -1342,14 +1348,12 @@ def execute_showoci(outdir, prefix, config_file_path):
     else:
         commonTools.backup_file(outdir, resource, out_rep)
     out_file = out_rep+"/"+prefix
-    out = ["-cf", config_file_path, '-csv', out_file]
-    cmd = cmd + " " + out[0] + " " + out[1] + " " + out[2] + " " + out[3]
+    out = ['-csv', out_file]
+    cmd = cmd + " " + out[0] + " " + out[1]
     split.extend(out)
     print("Executing: " + cmd)
     execute(split, config_file_path)
-    print("\n##############################")
-    print("ShowOCI report is available at : "+out_rep)
-    print("\n##############################")
+
 
 
 def run_showoci(outdir, prefix, config_file,sub_options=[]):

jenkins_install/scriptler/scripts/AdditionalFilters.groovy

@@ -19,7 +19,7 @@ html_to_be_rendered = """
    <tr>
    <td ><input type=\"hidden\" id=\"sep1\" name=\"value\" value=\"reg_filter=\"></td>
    <td><label for="value">Select Regions (Optional) :</label></td>
-   <td ><select multiple name="value" style="width:20%;">${reg_options} </select></td>
+   <td ><select multiple name="value" style="width:150px;">${reg_options} </select></td>
    <td ><input type=\"hidden\" id=\"sep1\" name=\"value\" value=\"@\"></td>
    </tr><tr></tr><tr></tr><tr></tr>
    <tr>