anvil: improve image cache propagation

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
kronosnet · Jan 10, 2024 · 255407b · 255407b
1 parent f0cf71c
commit 255407b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/ci-setup-anvil-bm-vm b/ci-setup-anvil-bm-vm
@@ -212,7 +212,7 @@ cd anvil-test-suite
 set +e
 ./run-tests $runtestopts -t $TESTS -b $BREAKPOINT
 ret=$?
-cd /root/ci-tools
+cd $HOME/ci-tools
 
 # collecting all build info
 rm -rf $DEPLOYDIR/logs/

diff --git a/ci-setup-anvil-bm-vm-cache b/ci-setup-anvil-bm-vm-cache
@@ -17,6 +17,8 @@ done
 
 cd "$DEPLOYDIR/images"
 
+rsync -av --progress anvil-ci-proxy:ci-cache/* .
+
 if [ -n "$SRCURL" ]; then
  echo "Downloading latest $NAME cloud image"
 

diff --git a/ci-setup-anvil-vm-env b/ci-setup-anvil-vm-env
@@ -44,12 +44,12 @@ case "$BUILD" in
  rhel-8)
   NAME="RHEL 8"
   KVMVAR="rhel8-unknown"
-  CRED="/root/rh-cred"
+  CRED="$HOME/rh-cred"
  ;;
  rhel-9)
   NAME="RHEL 9"
   KVMVAR="rhel9-unknown"
-  CRED="/root/rh-cred"
+  CRED="$HOME/rh-cred"
  ;;
  none)
  ;;
@@ -114,6 +114,8 @@ if [ ! -d "$TEMPLATESDIR" ]; then
  exit 1
 fi
 
+rsync -a anvil-ci-proxy:ci-creds/* $HOME/
+
 if [ -n "$CRED" ]; then
  if [ ! -f "$CRED" ]; then
   echo "Unable to access $CRED file"
@@ -127,12 +129,12 @@ if [ -n "$CRED" ]; then
  fi
 fi
 
-if [ ! -f "/root/alteeve-key" ]; then
+if [ ! -f "$HOME/alteeve-key" ]; then
  echo "Unable to access alteeve-key"
  exit 1
 fi
 
-export AKEY=$(cat /root/alteeve-key)
+export AKEY=$(cat $HOME/alteeve-key)
 
 mkdir -p "$DEPLOYDIR/images"
 mkdir -p "$DEPLOYDIR/cache"