Inject additional repositories for server and proxy

Author: NamelessOne91

jenkins_pipelines/environments/common/pipeline-build-validation.groovy

@@ -104,6 +104,9 @@ def run(params) {
                     commonArgs += " --inject CUCUMBER_BRANCH=${params.cucumber_ref}"
                     if (product_version) { commonArgs += " --inject PRODUCT_VERSION=${product_version}" }
                     if (base_os) { commonArgs += " --inject BASE_OS=${base_os}" }
+                    if ( fileExists('custom_repositories.json')) {
+                        commonArgs += " --custom-repositories-json ${WORKSPACE}/custom_repositories.json"   
+                    }
 
                     // Personal scenario specific arguments
                     def scenarioArgs = ""

jenkins_pipelines/scripts/tf_vars_generator/prepare_tfvars.py

@@ -1,4 +1,5 @@
 import argparse
+import json
 import logging
 import sys
 import re
@@ -194,6 +195,7 @@ def save(self, output_path):
     parser.add_argument("--string-registry", default="false")
     parser.add_argument("--merge-files", nargs='*', default=[], help="Files to merge (Scenario Classic BV)")
     parser.add_argument("--inject", action='append', help="KEY=VALUE")
+    parser.add_argument("--custom-repositories-json", default="", help="JSON file defining additional repositories")
 
     # Cleaning Args
     parser.add_argument("--clean", action='store_true', help="Enable resource cleaning")
@@ -236,8 +238,22 @@ def save(self, output_path):
     if args.inject:
         for item in args.inject:
             if '=' in item:
-                k, v = item.split('=', 1)
+                k, v = item.split('=', 1) 
                 vars_to_inject[k] = v
+
+    # INJECT CUSTOM REPOSITORIES FOR SERVER AND PROXY
+    if args.custom_repositories_json:
+        try:
+            with open(args.custom_repositories_json, 'r') as f:
+                repos: dict = json.load(f)
+        except Exception as e:
+            print(f"\n[ERROR]: Failed to parse custom repositorie JSON file at {args.custom_repositories_json}. Error: {e}")
+            sys.exit(1)
+
+        for k in ["server", "proxy"]:
+            if k in repos:
+                vars_to_inject[f"{k.upper()}_ADDITIONAL_REPOS"] = repos[k]
+
     gen.inject_variables(vars_to_inject)
 
     # CLEANING

terracumber_config/tf_files/templates/build-validation-multi-providers.tf

@@ -224,7 +224,9 @@ module "build_validation_module" {
 
   server_container_repository = var.SERVER_CONTAINER_REPOSITORY
   server_container_image      = var.SERVER_CONTAINER_IMAGE
+  server_additional_repos     = var.SERVER_ADDITIONAL_REPOS
   proxy_container_repository  = var.PROXY_CONTAINER_REPOSITORY
+  proxy_additional_repos      = var.PROXY_ADDITIONAL_REPOS
   base_os                     = var.BASE_OS
 }
 

terracumber_config/tf_files/templates/build-validation-single-provider.tf

@@ -84,7 +84,9 @@ module "build_validation_module" {
 
   server_container_repository = var.SERVER_CONTAINER_REPOSITORY
   server_container_image      = var.SERVER_CONTAINER_IMAGE
+  server_additional_repos     = var.SERVER_ADDITIONAL_REPOS
   proxy_container_repository  = var.PROXY_CONTAINER_REPOSITORY
+  proxy_additional_repos      = var.PROXY_ADDITIONAL_REPOS
   base_os                     = var.BASE_OS
 }
 

terracumber_config/tf_files/variables/build-validation-variables.tf

@@ -114,12 +114,24 @@ variable "SERVER_CONTAINER_REPOSITORY" {
   default = ""
 }
 
+variable "SERVER_ADDITIONAL_REPOS" {
+  type        = map(string)
+  description = "extra server repositories in the form {label = url}"
+  default     = {}
+}
+
 variable "PROXY_CONTAINER_REPOSITORY" {
   type = string
   description = "Proxy container registry path, not needed for 4.3"
   default = ""
 }
 
+variable "PROXY_ADDITIONAL_REPOS" {
+  type        = map(string)
+  description = "extra proxy repositories in the form {label = url}"
+  default     = {}
+}
+
 variable "SERVER_CONTAINER_IMAGE" {
   type = string
   description = "Server container image, not needed for 4.3"