diff --git a/docs/azure.md b/docs/azure.md index fd7906f9b3..9cb93d957a 100644 --- a/docs/azure.md +++ b/docs/azure.md @@ -342,14 +342,14 @@ When Nextflow creates a pool of compute nodes, it selects: Together, these settings determine the Operating System and version installed on each node. -By default, Nextflow creates pool nodes based on Ubuntu 20.04, but this behavior can be customised in the pool configuration. Below are configurations for image reference/SKU combinations to select two popular systems. +By default, Nextflow creates pool nodes based on Ubuntu 22.04, but this behavior can be customised in the pool configuration. Below are configurations for image reference/SKU combinations to select two popular systems. -- Ubuntu 20.04 (default): +- Ubuntu 22.04 (default): ```groovy - azure.batch.pools..sku = "batch.node.ubuntu 20.04" - azure.batch.pools..offer = "ubuntu-server-container" - azure.batch.pools..publisher = "microsoft-azure-batch" + azure.batch.pools..sku = "batch.node.ubuntu 22.04" + azure.batch.pools..offer = "ubuntu-hpc" + azure.batch.pools..publisher = "microsoft-dsvm" ``` - CentOS 8: diff --git a/plugins/nf-azure/src/main/nextflow/cloud/azure/config/AzPoolOpts.groovy b/plugins/nf-azure/src/main/nextflow/cloud/azure/config/AzPoolOpts.groovy index 01a3570c4b..2f424e5b5d 100644 --- a/plugins/nf-azure/src/main/nextflow/cloud/azure/config/AzPoolOpts.groovy +++ b/plugins/nf-azure/src/main/nextflow/cloud/azure/config/AzPoolOpts.groovy @@ -35,10 +35,10 @@ import nextflow.util.Duration @CompileStatic class AzPoolOpts implements CacheFunnel { - static public final String DEFAULT_PUBLISHER = "microsoft-azure-batch" - static public final String DEFAULT_OFFER = "ubuntu-server-container" - static public final String DEFAULT_SKU = "batch.node.ubuntu 20.04" - static public final String DEFAULT_VM_TYPE = "Standard_D4_v3" + static public final String DEFAULT_PUBLISHER = "microsoft-dsvm" + static public final String DEFAULT_OFFER = "ubuntu-hpc" + static public final String DEFAULT_SKU = "batch.node.ubuntu 22.04" + static public final String DEFAULT_VM_TYPE = "Standard_D4a_v4" static public final OSType DEFAULT_OS_TYPE = OSType.LINUX static public final String DEFAULT_SHARE_ROOT_PATH = "/mnt/batch/tasks/fsmounts" static public final Duration DEFAULT_SCALE_INTERVAL = Duration.of('5 min') diff --git a/plugins/nf-azure/src/test/nextflow/cloud/azure/batch/AzBatchServiceTest.groovy b/plugins/nf-azure/src/test/nextflow/cloud/azure/batch/AzBatchServiceTest.groovy index a691ec46f1..7923da46fc 100644 --- a/plugins/nf-azure/src/test/nextflow/cloud/azure/batch/AzBatchServiceTest.groovy +++ b/plugins/nf-azure/src/test/nextflow/cloud/azure/batch/AzBatchServiceTest.groovy @@ -452,7 +452,7 @@ class AzBatchServiceTest extends Specification { then: 1 * svc.guessBestVm(LOC, CPUS, MEM, null, TYPE) >> VM and: - spec.poolId == 'nf-pool-289d374ac1622e709cf863bce2570cab-Standard_X1' + spec.poolId == 'nf-pool-e3331cce25aa1563d6046b3de9ec2d93-Standard_X1' spec.metadata == [foo: 'bar'] } diff --git a/plugins/nf-azure/src/test/nextflow/cloud/azure/config/AzureConfigTest.groovy b/plugins/nf-azure/src/test/nextflow/cloud/azure/config/AzureConfigTest.groovy index 07a614944e..74e2a8b6e8 100644 --- a/plugins/nf-azure/src/test/nextflow/cloud/azure/config/AzureConfigTest.groovy +++ b/plugins/nf-azure/src/test/nextflow/cloud/azure/config/AzureConfigTest.groovy @@ -77,7 +77,7 @@ class AzureConfigTest extends Specification { cfg.batch().location == null cfg.batch().autoPoolMode == null cfg.batch().allowPoolCreation == null - cfg.batch().autoPoolOpts().vmType == 'Standard_D4_v3' + cfg.batch().autoPoolOpts().vmType == 'Standard_D4a_v4' cfg.batch().autoPoolOpts().vmCount == 1 cfg.batch().autoPoolOpts().maxVmCount == 3 cfg.batch().autoPoolOpts().scaleInterval == Duration.of('5 min') diff --git a/validation/azure.config b/validation/azure.config index 31574e6263..7e80bc53ed 100644 --- a/validation/azure.config +++ b/validation/azure.config @@ -25,7 +25,6 @@ azure { pools { 'nextflow-ci' { autoScale = true - vmType = 'Standard_D2_v3' } } }