fixing some bugs

Author: telliere

.github/workflows/build-container-prep-image.yml

@@ -12,9 +12,11 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v4
+        with:
+          lfs: 'true'
 
       - name: Build image
-        run: docker build . -f ./client/container_preparation/Dockerfile -t $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
+        run: git lfs pull ; docker build . -f ./client/container_preparation/Dockerfile -t $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
 
       - name: Log in to registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin

.github/workflows/build-data-prep-image.yml

@@ -12,9 +12,11 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v4
+        with:
+          lfs: 'true'
 
       - name: Build image
-        run: docker build . -f ./client/data_preparation/Dockerfile -t $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
+        run: git lfs pull ; docker build . -f ./client/data_preparation/Dockerfile -t $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
 
       - name: Log in to registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin

.github/workflows/build-job-prep-image.yml

@@ -12,9 +12,11 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v4
+        with:
+          lfs: 'true'
 
       - name: Build image
-        run: docker build . -f ./client/job_preparation/Dockerfile -t $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
+        run: git lfs pull ; docker build . -f ./client/job_preparation/Dockerfile -t $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
 
       - name: Log in to registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin

.github/workflows/build-server-image.yml

@@ -12,9 +12,11 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v4
+        with:
+          lfs: 'true'
 
       - name: Build image
-        run: docker build . -f ./server/Dockerfile -t $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
+        run: git lfs pull ; docker build . -f ./server/Dockerfile -t $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
 
       - name: Log in to registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin

client/job_preparation/prepare_job.py

@@ -53,7 +53,7 @@
     ssh_copy_file(ssh_client, sbatch_path, f"~/")
 
     # Copy config file to supercomputer
-    ssh_copy_file(ssh_client, options.config, f"~/.config/hpcs.conf")
+    ssh_copy_file(ssh_client, options.config, f"~/.config/hpcs-client.conf")
 
     # Create public encryption key for output data
     ident = x25519.Identity.generate()
@@ -63,7 +63,7 @@
         public_key_file.write(str(ident.to_public()))
 
     # Write private key to current directory
-    with open("./private_key", "w+") as private_key_file:
+    with open("/tmp/private_key", "w+") as private_key_file:
         private_key_file.write(str(ident))
 
     # Copy public key to supercomputer

utils/agent-on-the-fly.conf

@@ -28,9 +28,6 @@ plugins {
             discover_workload_path = true
         }
     }
-        
-    WorkloadAttestor "systemd" {
-    }
 
     WorkloadAttestor "docker" {
         plugin_data {}

utils/ssh_utils.py

@@ -35,8 +35,8 @@ def ssh_connect(username: str) -> SSHClient:
             host,
             port,
             username=username,
-             pkey=pkey,
-             look_for_keys=False,
+            pkey=pkey,
+            look_for_keys=False,
             auth_timeout=30,
             timeout=30,
         )