feat(ci.jenkins.io, trusted.ci.jenkins.io,cert.ci.jenkins.io) Update …

…Azure VM agents default configuration (#2635)
jenkins-infra · Feb 14, 2023 · 4001d00 · 4001d00
1 parent 54d2712
commit 4001d00
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/dist/profile/templates/jenkinscontroller/casc/clouds.yaml.erb b/dist/profile/templates/jenkinscontroller/casc/clouds.yaml.erb
@@ -48,6 +48,7 @@ jenkins:
         location: "<%= agent['location'] %>"
         noOfParallelJobs: 1
         osDiskSize: <%= agent['osDiskSize'] ? agent['osDiskSize'] : @jcasc['agents_setup'][agent['os'].to_s]['osDiskSize'] %>
+        osDiskStorageAccountType: <%= agent['osDiskStorageAccountType'] ? agent['osDiskStorageAccountType'] : @jcasc['agents_setup'][agent['os'].to_s]['osDiskStorageAccountType'] %>
         osType: "<%= agent['os'].to_s == "windows" ? 'Windows' : 'Linux' %>"
         preInstallSsh: false
       <%- if agent['idleTerminationMinutes'] -%>

diff --git a/hieradata/clients/cert-ci.yaml b/hieradata/clients/cert-ci.yaml
@@ -83,7 +83,6 @@ profile::jenkinscontroller::jcasc:
           architecture: amd64
           labels:
             - linux
-          idleTerminationMinutes: 5
           maxInstances: 7 # Quota of 56 vCPUs
           useAsMuchAsPossible: true
           credentialsId: "azure-login"
@@ -99,7 +98,6 @@ profile::jenkinscontroller::jcasc:
           architecture: amd64
           labels:
             - windows
-          idleTerminationMinutes: 5
           maxInstances: 7 # Quota of 56 vCPUs
           useAsMuchAsPossible: true
           credentialsId: "azure-login"

diff --git a/hieradata/clients/trusted-ci.yaml b/hieradata/clients/trusted-ci.yaml
@@ -87,7 +87,6 @@ profile::jenkinscontroller::jcasc:
             - docker
             - maven-11
             - jdk11
-          idleTerminationMinutes: 5
           maxInstances: 7 # Quota of 56 vCPUs
           useAsMuchAsPossible: true
           credentialsId: "azure-jenkins-user"
@@ -103,7 +102,6 @@ profile::jenkinscontroller::jcasc:
           architecture: amd64
           labels:
             - docker-windows
-          idleTerminationMinutes: 5
           maxInstances: 7 # Quota of 56 vCPUs
           useAsMuchAsPossible: true
           credentialsId: "azure-jenkins-user"

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
@@ -216,14 +216,16 @@ profile::jenkinscontroller::jcasc:
       # Double Backslash is required (for EC2 plugin as we hackishly use the unix launched for Windows to use OpenSSH)
       tempDir: 'C:\\\\Temp'
       remoteAdmin: Administrator
-      osDiskSize: 128
+      osDiskSize: 150
+      osDiskStorageAccountType: 'Premium_LRS'
       agentJavaBin: 'C:/tools/jdk-11/bin/java'
       agentJavaOpts: '-XX:+PrintCommandLineFlags'
     ubuntu:
       agentDir: "/home/jenkins"
       remoteAdmin: jenkins
       tempDir: "/tmp"
-      osDiskSize: 90
+      osDiskSize: 150
+      osDiskStorageAccountType: 'Premium_LRS'
       agentJavaBin: '/opt/jdk-11/bin/java'
       agentJavaOpts: '-XX:+PrintCommandLineFlags'
       path: '/home/jenkins/.asdf/shims:/home/jenkins/.asdf/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin'