Switch over Jenkins labels to linux-amd64

inviqa · Apr 25, 2022 · 984ed28 · 984ed28
1 parent 26edf52
commit 984ed28
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-    agent { label 'my127ws' }
+    agent { label 'linux-amd64' }
     environment {
         COMPOSE_DOCKER_CLI_BUILD = 1
         DOCKER_BUILDKIT = 1
@@ -24,10 +24,10 @@ pipeline {
                     // Choose a different agent to our "main" one
                     agent {
                        docker {
-                            label 'my127ws'
+                            label 'linux-amd64'
                             alwaysPull true
                             image 'quay.io/inviqa_images/workspace:latest'
-                            args '--entrypoint "" --volume /var/run/docker.sock:/var/run/docker.sock --volume "$HOME/.my127:/root/.my127"'
+                            args '--group-add docker --entrypoint "" --volume /var/run/docker.sock:/var/run/docker.sock --volume "$HOME/.my127:/root/.my127"'
                         }
                     }
                     stages {
@@ -136,10 +136,10 @@ pipeline {
                     // Choose a different agent to our "main" one
                     agent {
                         docker {
-                            label 'my127ws'
+                            label 'linux-amd64'
                             alwaysPull true
                             image 'quay.io/inviqa_images/workspace:latest'
-                            args '--entrypoint "" --volume /var/run/docker.sock:/var/run/docker.sock --volume "$HOME/.my127:/root/.my127"'
+                            args '--group-add docker --entrypoint "" --volume /var/run/docker.sock:/var/run/docker.sock --volume "$HOME/.my127:/root/.my127"'
                         }
                     }
                     stages {
@@ -227,10 +227,10 @@ pipeline {
                         docker {
                             // Reuse the same agent selected at the top of the file
                             reuseNode true
-                            label 'my127ws'
+                            label 'linux-amd64'
                             alwaysPull true
                             image 'quay.io/inviqa_images/workspace:latest'
-                            args '--entrypoint "" --volume /var/run/docker.sock:/var/run/docker.sock --volume "$HOME/.my127:/root/.my127"'
+                            args '--group-add docker --entrypoint "" --volume /var/run/docker.sock:/var/run/docker.sock --volume "$HOME/.my127:/root/.my127"'
                         }
                     }
                     stages {

diff --git a/src/_base/application/overlay/Jenkinsfile.twig b/src/_base/application/overlay/Jenkinsfile.twig
@@ -1,5 +1,5 @@
 pipeline {
-    agent { label "my127ws" }
+    agent { label 'linux-amd64' }
     environment {
         COMPOSE_DOCKER_CLI_BUILD = {{ @('jenkins.docker.buildkit.enabled') ? '1' : '0' }}
         DOCKER_BUILDKIT = {{ @('jenkins.docker.buildkit.enabled') ? '1' : '0' }}

diff --git a/src/drupal8/application/overlay/Jenkinsfile.twig b/src/drupal8/application/overlay/Jenkinsfile.twig
@@ -1,5 +1,5 @@
 pipeline {
-    agent { label "my127ws" }
+    agent { label 'linux-amd64' }
     environment {
         COMPOSE_DOCKER_CLI_BUILD = {{ @('jenkins.docker.buildkit.enabled') ? '1' : '0' }}
         DOCKER_BUILDKIT = {{ @('jenkins.docker.buildkit.enabled') ? '1' : '0' }}