ci: fix failures in nightly (#3042)

- fix log folder names used by nightly jobs
- fix attempt to install containerd.io in the redis pipeline (which conflicts with containerd)

Signed-off-by: Andrei Aaron <aaaron@luxoft.com>

.github/workflows/nightly.yaml

@@ -259,11 +259,11 @@ jobs:
       - name: print service logs
         run: |
           sudo dmesg
-          cat /tmp/zot-logs/*.log
+          cat /tmp/zot-ft-logs/dynamo-scale/*.log
       - name: multi-hop detection
         id: multihop
         run: |
-          if cat /tmp/zot-logs/*.log | grep 'cannot proxy an already proxied request'; then
+          if cat /tmp/zot-ft-logs/dynamo-scale/*.log | grep 'cannot proxy an already proxied request'; then
             echo "detected multi-hop"
             exit 1
           else
@@ -272,7 +272,7 @@ jobs:
         continue-on-error: true
       - name: clean up logs
         run: |
-          rm -r /tmp/zot-logs
+          rm -r /tmp/zot-ft-logs/dynamo-scale
       - name: fail job if error
         if: ${{ steps.scale.outcome != 'success' || steps.multihop.outcome != 'success' }}
         run: |
@@ -300,7 +300,7 @@ jobs:
           go install github.com/swaggo/swag/cmd/swag@v1.16.2
           go mod download
           sudo apt-get update
-          sudo apt-get install libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config rpm uidmap haproxy jq docker.io
+          sudo apt-get install libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config rpm uidmap haproxy jq
           # install skopeo
           git clone -b v1.12.0 https://github.com/containers/skopeo.git
           cd skopeo
@@ -340,7 +340,7 @@ jobs:
         if: always()
         with:
           name: zot-scale-out-redis-logs
-          path: /tmp/zot-ft-logs
+          path: /tmp/zot-ft-logs/redis-scale
           if-no-files-found: error
       - name: print service logs
         run: |
@@ -349,7 +349,7 @@ jobs:
       - name: multi-hop detection
         id: multihop
         run: |
-          if cat /tmp/zot-ft-logs/redis/*.log | grep 'cannot proxy an already proxied request'; then
+          if cat /tmp/zot-ft-logs/redis-scale/*.log | grep 'cannot proxy an already proxied request'; then
             echo "detected multi-hop"
             exit 1
           else
@@ -358,7 +358,7 @@ jobs:
         continue-on-error: true
       - name: clean up logs
         run: |
-          rm -r /tmp/zot-ft-logs/redis
+          rm -r /tmp/zot-ft-logs/redis-scale
       - name: fail job if error
         if: ${{ steps.scale.outcome != 'success' || steps.multihop.outcome != 'success' }}
         run: |

test/scale-out/cloud_scale_out_basic_auth_tls_scale.bats

@@ -3,6 +3,7 @@
 #       extra tools that are not covered in Makefile target needs to be added in verify_prerequisites()
 
 NUM_ZOT_INSTANCES=6
+ZOT_LOG_DIR=/tmp/zot-ft-logs/dynamo-scale
 
 load helpers_zot
 load helpers_cloud
@@ -14,10 +15,10 @@ function launch_zot_server() {
     local zot_root_dir=${ZOT_ROOT_DIR}
 
     mkdir -p ${zot_root_dir}
-    mkdir -p /tmp/zot-logs
+    mkdir -p ${ZOT_LOG_DIR}
 
     local zot_config_file="${BATS_FILE_TMPDIR}/zot_config_${zot_server_address}_${zot_server_port}.json"
-    local zot_log_file="/tmp/zot-logs/zot-${zot_server_address}-${zot_server_port}.log"
+    local zot_log_file="${ZOT_LOG_DIR}/zot-${zot_server_address}-${zot_server_port}.log"
 
     create_zot_cloud_base_config_file ${zot_server_address} ${zot_server_port} ${zot_root_dir} ${zot_config_file} ${zot_log_file}
     update_zot_cluster_member_list_in_config_file ${zot_config_file} ${ZOT_CLUSTER_MEMBERS_PATCH_FILE}