Final solution

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@hpe.com>

Priority: 2

Skip-unit-tests:true
Skip-unit-test: true
Skip-NLT: true
Skip-unit-test-memcheck: true

Skip-func-test-el8: true
Skip-func-test-el9: true
Skip-func-test-leap15: false
Skip-fault-injection-test: true
Skip-test-el-9.6-rpms: true
Skip-test-leap-15-rpms: false

Skip-func-hw-test: true

Author: grom72

utils/rpms/packaging/rpm_chrootbuild

@@ -54,10 +54,11 @@ repo_adds=()
 repo_dels=()
 
 # Only for Leap 15.6 chroot
+# see ../../docker/Dockerfile.leap.15 for more details
 if [[ "${CHROOT_NAME}" == *opensuse-leap-15.6* ]]; then
-    repo_adds+=("--enablerepo=*-lua-*")
-    repo_adds+=("--enablerepo=opensuse-network-cluster-proxy-artifactory")
-    repo_adds+=("--enablerepo=opensuse-oss-proxy-artifactory")
+    repo_adds+=("--enablerepo=*opensuse-devel-languages-lua-*")
+    repo_adds+=("--enablerepo=*opensuse-network-cluster-*")
+    repo_adds+=("--enablerepo=*opensuse-oss-*")
 fi
 
 echo -e "config_opts['yum.conf'] += \"\"\"\n" >> mock.cfg
@@ -129,18 +130,20 @@ done
 echo "\"\"\"" >> mock.cfg
 
 # Only for Leap 15.6 chroot
+# see ../../docker/Dockerfile.leap.15 for more details
 if [[ "${CHROOT_NAME}" == *opensuse-leap-15.6* ]]; then
     # Ensure lua-lmod is installed in the chroot
-    echo "" >> mock.cfg
-    echo "_pkgs = config_opts.get('chroot_additional_packages')" >> mock.cfg
-    echo "if _pkgs is None:" >> mock.cfg
-    echo "    config_opts['chroot_additional_packages'] = ['lua-lmod']" >> mock.cfg
-    echo "elif isinstance(_pkgs, str):" >> mock.cfg
-    echo "    config_opts['chroot_additional_packages'] = (_pkgs + ' lua-lmod').strip()" >> mock.cfg
-    echo "elif isinstance(_pkgs, (list, tuple)):" >> mock.cfg
-    echo "    config_opts['chroot_additional_packages'] = list(_pkgs) + ['lua-lmod']" >> mock.cfg
-    echo "else:" >> mock.cfg
-    echo "    raise TypeError(f\"Unexpected type for chroot_additional_packages: {type(_pkgs)}\")" >> mock.cfg
+    cat >> mock.cfg <<'EOF'
+
+_pkgs = config_opts.get('chroot_additional_packages')
+if _pkgs is None:
+    config_opts['chroot_additional_packages'] = ['lua-lmod']
+elif isinstance(_pkgs, str):
+    config_opts['chroot_additional_packages'] = f"{_pkgs} lua-lmod".strip()
+else:
+    config_opts['chroot_additional_packages'] = list(_pkgs) + ['lua-lmod']
+EOF
+
 fi
 
 if [ -n "$DISTRO_VERSION" ]; then