build(arm): Update profile names

nf-core/tools#3536

Author: edmundmiller

.github/workflows/cloud_tests_full.yml

@@ -32,7 +32,7 @@ jobs:
           workdir: "${{ secrets.TOWER_BUCKET_AWS }}/work/rnaseq/work-${{ github.sha }}"
           run_name: "aws_rnaseq_full_${{ matrix.aligner }}_${{ matrix.arch }}"
           revision: ${{ github.sha }}
-          profiles: test_full_aws${{ matrix.arch == 'arm64' && ',wave,graviton' || '' }}
+          profiles: test_full_aws${{ matrix.arch == 'arm64' && ',docker_arm' || '' }}
           parameters: |
             {
                 "hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",

.github/workflows/cloud_tests_small.yml

@@ -30,7 +30,7 @@ jobs:
           workdir: "${{ secrets.TOWER_BUCKET_AWS }}/work/rnaseq/work-${{ github.sha }}"
           run_name: "aws_rnaseq_small_${{ matrix.arch }}"
           revision: ${{ github.sha }}
-          profiles: test${{ matrix.arch == 'arm64' && ',wave,graviton' || '' }}
+          profiles: test${{ matrix.arch == 'arm64' && ',docker_arm' || '' }}
           parameters: |
             {
                 "outdir": "${{ secrets.TOWER_BUCKET_AWS }}/rnaseq/results-test-${{ github.sha }}/${{ matrix.arch }}/aligner_${{ matrix.aligner }}/"

nextflow.config

@@ -191,14 +191,8 @@ profiles {
         apptainer.enabled       = false
         docker.runOptions       = '-u $(id -u):$(id -g)'
     }
-    arm {
-        docker.runOptions       = '-u $(id -u):$(id -g) --platform=linux/amd64'
-    }
-    // TODO PR this to tools
-    graviton {
-        process.arch            = 'linux/arm64'
-    }
     singularity {
+        includeConfig 'conf/containers/containers_singularity_amd64.config'
         singularity.enabled     = true
         singularity.autoMounts  = true
         conda.enabled           = false
@@ -264,6 +258,33 @@ profiles {
             ]
         }
     }
+    // ARM Related Profiles
+    apple {
+        docker.runOptions       = '-u $(id -u):$(id -g) --platform=linux/amd64'
+    }
+    docker_arm {
+        includeConfig 'conf/containers/containers_docker_arm64.config'
+        docker.enabled          = true
+        conda.enabled           = false
+        singularity.enabled     = false
+        podman.enabled          = false
+        shifter.enabled         = false
+        charliecloud.enabled    = false
+        apptainer.enabled       = false
+        docker.runOptions       = '-u $(id -u):$(id -g)'
+    }
+    singularity_arm {
+        includeConfig 'conf/containers/containers_singularity_arm64.config'
+        singularity.enabled     = true
+        singularity.autoMounts  = true
+        conda.enabled           = false
+        docker.enabled          = false
+        podman.enabled          = false
+        shifter.enabled         = false
+        charliecloud.enabled    = false
+        apptainer.enabled       = false
+    }
+
     test          { includeConfig 'conf/test.config'       }
     test_full     { includeConfig 'conf/test_full.config'  }
     test_full_aws {