Fic leap solution

Cancel-prev-build: false
Priority: 2

Skip-python-bandit: true

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

Skip-func-vm: true
Skip-fault-injection-test: false

Skip-func-hw-test: true

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

Author: grom72

utils/docker/Dockerfile.el.8

@@ -47,9 +47,9 @@ FROM basic
 # with a local repository, yet needing a proxy to reach outside repositories.
 # This needs to be moved to a shell script like above in the future to
 # properly only remove the proxy variables only when they need to be removed
-RUN dnf upgrade && \
-    /tmp/install.sh && \
-    dnf clean all && \
+RUN dnf upgrade &&        \
+    /tmp/install.sh &&    \
+    dnf clean all &&      \
     rm -f /tmp/install.sh
 
 # Add DAOS users

utils/scripts/helpers/repo-helper-leap15.sh

@@ -184,9 +184,18 @@ if [ -n "$REPO_FILE_URL" ]; then
     quiet = 1
 EOF
 
-# Setup RubyGems to use artifactory as the installation source.
-    cat <<EOF > /etc/gemrc
-:sources:
-- https://${trusted_host}/artifactory/api/gems/rubygems-proxy/
-EOF
+# Setup RubyGems to use artifactory as the primary installation source.
+# Prior to setup, it is essential to ensure that Ruby-Dev is installed.
+# Failure to comply with this procedure will result 
+# in the manual /etc/gemrc file being overridden.
+    dnf --nodocs install ruby-devel
+gem env
+gem source --list
+    if [ ! -f /etc/gemrc ]; then
+        echo ":sources:" > /etc/gemrc
+    elif ! grep -q '^:sources:$' /etc/gemrc; then
+        echo ":sources:" >> /etc/gemrc
+    fi
+    sed -i "/^:sources:$/a- https://${trusted_host}/artifactory/api/gems/rubygems-proxy/" \
+    /etc/gemrc
 fi

utils/scripts/install-el8.sh

@@ -117,6 +117,4 @@ else
     dnf install ${dnf_install_args} maven
 fi
 
-gem env
-gem source --list
-gem install fpm --verbose
+gem install fpm