From 5dae4cc8c69ae93e4a438f8bee003050eddd9efe Mon Sep 17 00:00:00 2001 From: andytson-inviqa <andytson-inviqa@users.noreply.github.com> Date: Mon, 18 Apr 2022 13:50:41 +0100 Subject: [PATCH] Switch over Jenkins labels to linux-amd64 --- Jenkinsfile | 8 ++++---- src/_base/application/overlay/Jenkinsfile.twig | 2 +- src/drupal8/application/overlay/Jenkinsfile.twig | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c5ff46f7f..ac95b5ef7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ def isHarnessChange(harnesses) { } pipeline { - agent { label 'my127ws' } + agent { label 'linux-amd64' } environment { COMPOSE_DOCKER_CLI_BUILD = 1 DOCKER_BUILDKIT = 1 @@ -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"' @@ -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"' @@ -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"' diff --git a/src/_base/application/overlay/Jenkinsfile.twig b/src/_base/application/overlay/Jenkinsfile.twig index 38802c268..4f4518b1b 100644 --- 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 index a18653a55..94998b3b3 100644 --- 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' }}