fix cachix pushing of lixImage, skip scratchImage push

Author: Lillecarl

.github/workflows/ci.yaml

@@ -43,14 +43,12 @@ jobs:
           unlink nix-images || true
           nix build --show-trace --file . lixImage.push --out-link nix-images
           ./nix-images/bin/push
-          cachix push nix-csi ./nix-images
 
       - name: Build and push scratch image
         run: |
           unlink nix-scratches || true
           nix build --show-trace --file . scratchImage.push --out-link nix-scratches
           ./nix-scratches/bin/push
-          cachix push nix-csi ./nix-scratches
 
   test-kind-cache:
     needs: build
@@ -81,11 +79,11 @@ jobs:
 
       - name: Wait for nix-csi node daemonset
         run: |
-          kubectl rollout status daemonset/nix-node -n nix-csi --timeout=60s
+          kubectl rollout status daemonset/nix-node -n nix-csi --timeout=120s
 
       - name: Wait for nix-csi cache pod
         run: |
-          kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=cache -n nix-csi --timeout=60s
+          kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=cache -n nix-csi --timeout=120s
 
       - name: Wait for test workload
         run: |
@@ -94,7 +92,7 @@ jobs:
       - name: Delete jobs and verify CSI cleanup
         run: |
           kubectl delete job flake-hello expr-hello path-hello -n nix-csi
-          kubectl wait --for=delete pod -l "job-name in (flake-hello,expr-hello,path-hello)" -n nix-csi --timeout=60s
+          kubectl wait --for=delete pod -l "job-name in (flake-hello,expr-hello,path-hello)" -n nix-csi --timeout=120s
 
       - name: Print node logs
         run: |
@@ -147,7 +145,7 @@ jobs:
 
       - name: Wait for nix-csi node daemonset
         run: |
-          kubectl rollout status daemonset/nix-node -n nix-csi --timeout=60s
+          kubectl rollout status daemonset/nix-node -n nix-csi --timeout=120s
 
       - name: Wait for test workload
         run: |
@@ -156,7 +154,7 @@ jobs:
       - name: Delete jobs and verify CSI cleanup
         run: |
           kubectl delete job flake-hello expr-hello path-hello -n nix-csi
-          kubectl wait --for=delete pod -l "job-name in (flake-hello,expr-hello,path-hello)" -n nix-csi --timeout=60s
+          kubectl wait --for=delete pod -l "job-name in (flake-hello,expr-hello,path-hello)" -n nix-csi --timeout=120s
 
       - name: Print node logs
         run: |

liximage.nix

@@ -108,13 +108,16 @@ rec {
         pkgs.regctl
         pkgs.skopeo
         pkgs.gzip
+        pkgs.cachix
       ];
       text = # bash
         ''
           skopeo login -u="$REPO_USERNAME" -p="$REPO_TOKEN" ${server}
           regctl registry login -u="$REPO_USERNAME" -p="$REPO_TOKEN" ${server}
           ${copyToRegistry "aarch64-linux"}
           ${copyToRegistry "x86_64-linux"}
+          cachix push nix-csi ${images."aarch64-linux"}
+          cachix push nix-csi ${images."x86_64-linux"}
           regctl index create ${repo}/lix:${pkgs.lruLix.version} \
             --ref ${imageRef "aarch64-linux"} \
             --ref ${imageRef "x86_64-linux"}