Automation Toolkit Release v2024.4.3

Author: xs2suruchi

Dockerfile

@@ -62,6 +62,7 @@ sudo unzip terraform-provider-null_${TF_NULL_PROVIDER}_linux_amd64.zip -d /cd3us
 sudo cp -r /cd3user/.terraform.d/plugins/registry.terraform.io /cd3user/.terraform.d/plugins/registry.opentofu.org && \
 sudo chown -R cd3user:cd3user /cd3user/ && \
 sudo rm -rf terraform-provider-null_${TF_NULL_PROVIDER}_linux_amd64.zip terraform-provider-oci_${TF_OCI_PROVIDER}_linux_amd64.zip ;\
+
 fi
 
 ##################################### START INSTALLING JENKINS ###################################

cd3_automation_toolkit/user-scripts/createTenancyConfig.py

@@ -15,7 +15,6 @@
 import configparser
 import oci
 from oci.object_storage import ObjectStorageClient
-import git
 import glob
 import subprocess
 sys.path.append(os.getcwd()+"/..")
@@ -474,12 +473,14 @@ def create_bucket(config, signer):
     devops_user_key = config.get('Default', 'oci_devops_git_key').strip()
 
     # Check if Jenkins was installed during image build
-    if environ.get('USE_DEVOPS') is not None:
-        use_devops_docker = os.environ['USE_DEVOPS']
-        use_devops_docker=use_devops_docker.lower()
+    use_devops_docker = os.environ['USE_DEVOPS']
+    use_devops_docker=use_devops_docker.lower()
 
-        if use_devops_docker != use_devops:
-            use_devops = "no"
+    if use_devops_docker != use_devops:
+        use_devops = "no"
+
+    if use_devops == 'yes':
+        import git
 
     if use_devops == 'yes' or remote_state == 'yes':
         #Use remote state if using devops