Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch over Jenkins labels to linux-amd64 #676

Merged
merged 1 commit into from
May 13, 2022
Merged

Switch over Jenkins labels to linux-amd64 #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Jenkinsfile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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