Merge branch and do trival renames and fixes

CLASS · May 14, 2021 · f9b8e2e · f9b8e2e
1 parent 8f5b071
commit f9b8e2e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/...mpleSlurmJobs/helloworld_singularity.slrm → ...-gcp/examples/helloworld_singularity.slrm b/...mpleSlurmJobs/helloworld_singularity.slrm → ...-gcp/examples/helloworld_singularity.slrm
@@ -5,7 +5,7 @@
 #SBATCH --mem-per-cpu 2G
 #SBATCH --time 1-0:00:00
 #SBATCH --job-name singularity-helloworld
-#SBATCH --output hellowrold-singularity-%J.log
+#SBATCH --output helloworld-singularity-%J.log
 
 date
 hostname

diff --git a/...m-gcp/SampleSlurmJobs/jupyter_launch.slrm → slurm-gcp/examples/jupyter_launch.slrm b/...m-gcp/SampleSlurmJobs/jupyter_launch.slrm → slurm-gcp/examples/jupyter_launch.slrm
diff --git a/slurm-gcp/setup.sh b/slurm-gcp/setup.sh
@@ -3,4 +3,5 @@
 gcloud compute ssh class-controller -- < scripts/controller.sh
 
 gcloud compute ssh class-controller -- sudo -i < scripts/singularity.sh
+gcloud compute ssh class-controller -- sudo -i < scripts/install_miniconda.sh
 gcloud compute ssh class-controller -- < scripts/spack.sh