Add /scratch mapping

For the bootstap and ccaching. Update packaging/. Skip-PR-comments: true Run-GHA: true Required-githooks: true Signed-off-by: Brian J. Murrell <[email protected]>
daos-stack · Jul 3, 2024 · 0a19874 · 0a19874
1 parent 2ae4cd0
commit 0a19874
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/rpm-build.yml b/.github/workflows/rpm-build.yml
@@ -338,6 +338,7 @@ jobs:
                         --user build                                                                          \
                         -v "$PWD":"$PWD" -w "$PWD"                                                            \
                         -v "$PWD"/mock_result:/var/lib/mock/$CHROOT_NAME/result                               \
+                        -v /scratch:/scratch                                                                  \
                         --privileged=true                                                                     \
                         -e DAOS_FULLNAME="$DAOS_FULLNAME"                                                     \
                         -e DAOS_EMAIL="$DAOS_EMAIL"                                                           \

diff --git a/packaging/Dockerfile.ubuntu.20.04 b/packaging/Dockerfile.ubuntu.20.04
@@ -18,26 +18,23 @@ RUN if [ -n "$REPO_FILE_URL" ]; then                                 \
         true > ../sources.list &&                                    \
         mv daos_ci-ubuntu20.04-artifactory.list.tmp                  \
            daos_ci-ubuntu20.04-artifactory.list;                     \
+        url="${REPO_FILE_URL%/*/}/hpe-ilorest-ubuntu-bionic-proxy/"; \
+    else                                                             \
+        url="https://downloads.linux.hpe.com/SDR/repo/ilorest/";     \
     fi;                                                              \
     cd -;                                                            \
-    curl -f -O "$REPO_FILE_URL"esad_repo.key;                        \
-    gpg --no-default-keyring --keyring ./temp-keyring.gpg            \
-        --import esad_repo.key;                                      \
     mkdir -p /usr/local/share/keyrings/;                             \
+    curl -f -O "$url"GPG-KEY-hprest;                                 \
+    gpg --no-default-keyring --keyring ./temp-keyring.gpg            \
+        --import GPG-KEY-hprest;                                     \
     gpg --no-default-keyring --keyring ./temp-keyring.gpg --export   \
-        --output /usr/local/share/keyrings/daos-stack-public.gpg;    \
+        --output /usr/local/share/keyrings/hpe-sdr-public.gpg;       \
     rm ./temp-keyring.gpg;                                           \
-    url_prefix=https://downloads.linux.hpe.com/SDR/;                 \
-    for url in hpPublicKey2048.pub                                   \
-               hpPublicKey2048_key1.pub                              \
-               hpePublicKey2048_key1.pub; do                         \
-        curl -f -O "$url_prefix$url";                                \
-        gpg --no-default-keyring --keyring ./temp-keyring.gpg        \
-            --import "$(basename $url)";                             \
-    done;                                                            \
+    curl -f -O "$REPO_FILE_URL"esad_repo.key;                        \
+    gpg --no-default-keyring --keyring ./temp-keyring.gpg            \
+        --import esad_repo.key;                                      \
     gpg --no-default-keyring --keyring ./temp-keyring.gpg --export   \
-        --output /usr/local/share/keyrings/hpe-sdr-public.gpg;       \
-    rm ./temp-keyring.gpg
+        --output /usr/local/share/keyrings/daos-stack-public.gpg
 
 # Install basic tools
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \

diff --git a/packaging/Makefile_packaging.mk b/packaging/Makefile_packaging.mk
@@ -424,6 +424,8 @@ packaging_check:
 	          --exclude libfabric.spec                      \
 	          --exclude Makefile                            \
 	          --exclude README.md                           \
+	          --exclude SECURITY.md                         \
+	          --exclude LICENSE                             \
 	          --exclude _topdir                             \
 	          --exclude \*.tar.\*                           \
 	          --exclude \*.code-workspace                   \