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

Jump to bottom

chore: use a single Jenkinsfile for both ci.jenkins.io and infra.ci.jenkins.io #354

Merged
merged 13 commits into from
May 14, 2024
Merged

chore: use a single Jenkinsfile for both ci.jenkins.io and infra.ci.jenkins.io #354

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
80c42d8
chore: remove shared pipeline library test instruction
lemeurherve Feb 10, 2024
c55c8f5
one Jenkinsfile to rule them all
lemeurherve Feb 12, 2024
daff435
disable publication when not on infra.ci.jenkins.io
lemeurherve Feb 12, 2024
95bb78c
Merge branch 'main' into lemeurherve-patch-1
lemeurherve Feb 12, 2024
f064117
add arm comment
lemeurherve Feb 15, 2024
e9642b3
use large agents from https://github.com/jenkins-infra/kubernetes-man…
lemeurherve Mar 1, 2024
a0380e7
use large infra.ci agent
lemeurherve Mar 1, 2024
22d63a5
Merge branch 'main' into lemeurherve-patch-1
lemeurherve Mar 1, 2024
735ae87
use 'linux-arm64-docker' VM for infra.ci.jenkins.io
lemeurherve Mar 6, 2024
82c8645
Merge branch 'main' into lemeurherve-patch-1
dduportal Apr 30, 2024
f020a9f
force jdk17 with env
smerle33 May 14, 2024
382a355
change to amd64 to comply with selenium
smerle33 May 14, 2024
0f490c4
Merge branch 'main' into lemeurherve-patch-1
smerle33 May 14, 2024
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
6 changes: 2 additions & 4 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
@Library('pipeline-library@pull/784/head') _

pipeline {
agent {
label 'jdk17'
label 'jdk17 || linux-arm64'
lemeurherve marked this conversation as resolved.
Show resolved Hide resolved
lemeurherve marked this conversation as resolved.
Show resolved Hide resolved
lemeurherve marked this conversation as resolved.
Show resolved Hide resolved
}
options {
disableConcurrentBuilds(abortPrevious: true)
Expand Down Expand Up @@ -34,7 +32,7 @@ pipeline {
rebuildImageOnPeriodicJob: false,
automaticSemanticVersioning: true,
targetplatforms: 'linux/amd64,linux/arm64',
disablePublication: true
disablePublication: !infra.isInfra()
])
}
}
Expand Down
5 changes: 0 additions & 5 deletions Jenkinsfile_k8s
View file
Open in desktop

This file was deleted.