Merge remote-tracking branch 'origin/develop' into ubuntu-22.04-support

ci-scripts/docker/Dockerfile.upf-vpp.rhel7

@@ -63,10 +63,14 @@ RUN yum repolist --disablerepo=* && \
       tzdata\
       iproute \
       numactl-devel \
-      wget \
+      wget && \
+    wget --tries=4 --retry-connrefused --wait=8 \
       https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
-    wget http://repo.openfusion.net/centos7-x86_64/hyperscan-devel-5.3.0-1.of.el7.x86_64.rpm \
-         http://repo.openfusion.net/centos7-x86_64/hyperscan-5.3.0-1.of.el7.x86_64.rpm && \
+    rpm -i *.rpm && \
+    rm *.rpm && \
+    wget --tries=4 --retry-connrefused --wait=8 \
+      http://repo.openfusion.net/centos7-x86_64/hyperscan-devel-5.3.0-1.of.el7.x86_64.rpm \
+      http://repo.openfusion.net/centos7-x86_64/hyperscan-5.3.0-1.of.el7.x86_64.rpm && \
     rpm -i *.rpm && \
     rm *.rpm && \
     yum remove -y wget && \

docker/Dockerfile.upf-vpp.rhel7

@@ -43,22 +43,24 @@ RUN rm -f /etc/rhsm-host && \
     subscription-manager repos --enable rhel-server-rhscl-7-rpms && \
     subscription-manager repos --enable rhel-7-server-optional-rpms && \
     yum update -y && \
-    yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm &&\
+    yum install -y \
+        wget && \
+    wget --tries=4 --retry-connrefused --wait=8 https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm &&\
+    yum install -y epel-release-latest-7.noarch.rpm && \
+    rm -f epel-release-latest-7.noarch.rpm && \
     yum install -y \
         python3 \
         psmisc \
         git \
         make \
         patch \
-        sudo \
-        wget && \
-	rm -rf /var/lib/apt/lists/*
+        sudo
 
 # Some GIT configuration command quite useful
 RUN git config --global https.postBuffer 123289600 && \
     git config --global http.sslverify false
 
-RUN wget http://repo.openfusion.net/centos7-x86_64/hyperscan-devel-5.3.0-1.of.el7.x86_64.rpm \
+RUN wget --tries=4 --retry-connrefused --wait=8 http://repo.openfusion.net/centos7-x86_64/hyperscan-devel-5.3.0-1.of.el7.x86_64.rpm \
          http://repo.openfusion.net/centos7-x86_64/hyperscan-5.3.0-1.of.el7.x86_64.rpm \ 
          && rpm -i *.rpm
 
@@ -78,7 +80,10 @@ RUN git clone -b stable/2101 https://github.com/fdio/vpp.git && \
 RUN make install-dep -C vpp/
 RUN make build-release -C vpp/ && \
     ldd /vpp-upf/vpp/build-root/install-vpp-native/vpp/bin/vpp && \
-    ldd /vpp-upf/vpp/build-root/install-vpp-native/vpp/bin/vppctl
+    ldd /vpp-upf/vpp/build-root/install-vpp-native/vpp/bin/vppctl && \
+    # Remove entitlements and Subscription Manager configs
+    rm -rf /etc/pki/entitlement && \
+    rm -rf /etc/rhsm
 
 #---------------------------------------------------------------------
 # TARGET IMAGE
@@ -96,10 +101,14 @@ RUN yum repolist --disablerepo=* && \
       tzdata\
       iproute \
       numactl-devel \
-      wget \
+      wget && \
+    wget --tries=4 --retry-connrefused --wait=8 \
       https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
-    wget http://repo.openfusion.net/centos7-x86_64/hyperscan-devel-5.3.0-1.of.el7.x86_64.rpm \
-         http://repo.openfusion.net/centos7-x86_64/hyperscan-5.3.0-1.of.el7.x86_64.rpm && \
+    rpm -i *.rpm && \
+    rm *.rpm && \
+    wget --tries=4 --retry-connrefused --wait=8 \
+      http://repo.openfusion.net/centos7-x86_64/hyperscan-devel-5.3.0-1.of.el7.x86_64.rpm \
+      http://repo.openfusion.net/centos7-x86_64/hyperscan-5.3.0-1.of.el7.x86_64.rpm && \
     rpm -i *.rpm && \
     rm *.rpm && \
     yum remove -y wget && \