Skip to content

Commit

Permalink
Switch over Jenkins labels to linux-amd64
Browse files Browse the repository at this point in the history
  • Loading branch information
andytson-inviqa committed May 12, 2022
1 parent fdf164f commit 5dae4cc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ def isHarnessChange(harnesses) {
}

pipeline {
agent { label 'my127ws' }
agent { label 'linux-amd64' }
environment {
COMPOSE_DOCKER_CLI_BUILD = 1
DOCKER_BUILDKIT = 1
Expand All @@ -29,7 +29,7 @@ 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 '--group-add docker --entrypoint "" --volume /var/run/docker.sock:/var/run/docker.sock --volume "$HOME/.my127:/root/.my127"'
Expand Down Expand Up @@ -149,7 +149,7 @@ 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 '--group-add docker --entrypoint "" --volume /var/run/docker.sock:/var/run/docker.sock --volume "$HOME/.my127:/root/.my127"'
Expand Down Expand Up @@ -242,7 +242,7 @@ 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 '--group-add docker --entrypoint "" --volume /var/run/docker.sock:/var/run/docker.sock --volume "$HOME/.my127:/root/.my127"'
Expand Down
2 changes: 1 addition & 1 deletion src/_base/application/overlay/Jenkinsfile.twig
Original file line number Diff line number Diff line change
@@ -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' }}
Expand Down
2 changes: 1 addition & 1 deletion src/drupal8/application/overlay/Jenkinsfile.twig
Original file line number Diff line number Diff line change
@@ -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' }}
Expand Down

0 comments on commit 5dae4cc

Please sign in to comment.