Skip to content
This repository has been archived by the owner on Jan 21, 2024. It is now read-only.

refactor: build docker-inbound-agent like docker-agent #363

Merged
merged 18 commits into from
Jul 28, 2023
Merged

refactor: build docker-inbound-agent like docker-agent #363

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5c61d62
Import build.ps1 and build-windows.yaml from docker-agent before rece…
lemeurherve Jul 8, 2023
4cbfbf7
build Windows images with docker compose like docker-agent and regrou…
lemeurherve Jul 8, 2023
6b35c96
refactor builds like https://github.com/jenkinsci/docker-agent/pull/445
lemeurherve Jul 9, 2023
7f32ea1
revert images regroupment by OS type
lemeurherve Jul 11, 2023
f1df67a
restore jenkins-agent.ps1 location at root folder
lemeurherve Jul 11, 2023
2dcf69d
clean comments
lemeurherve Jul 11, 2023
55b83a8
restore (strange) context for jenkins-agent script COPY in linux Dock…
lemeurherve Jul 11, 2023
65d3001
restore docker-bake & jenkins-agent script location
lemeurherve Jul 11, 2023
79beb20
restore PARENT_IMAGE_VERSION instead of DOCKER_AGENT_VERSION
lemeurherve Jul 11, 2023
c3f7f7a
replace DOCKER_AGENT_VERSION by PARENT_IMAGE_VERSION
lemeurherve Jul 11, 2023
5aeca2e
replace 'VERSION' by 'version'
lemeurherve Jul 11, 2023
2e234ab
cleanup build.ps1
lemeurherve Jul 11, 2023
65b6325
restore 'version' case in tests.bats
lemeurherve Jul 11, 2023
4d5c5a9
restore outdated TODO comment, to be removed in another PR
lemeurherve Jul 11, 2023
f90a7e8
Merge branch 'master' into refactor-windows-builds-like-docker-agent
lemeurherve Jul 11, 2023
d9d68fd
Implement https://github.com/jenkinsci/docker-agent/pull/461/ too
lemeurherve Jul 12, 2023
ff94a04
trim spaces on empty line
lemeurherve Jul 12, 2023
6fe472c
cleanup
lemeurherve Jul 12, 2023
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
161 changes: 64 additions & 97 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,115 +3,82 @@ pipeline {

options {
buildDiscarder(logRotator(daysToKeepStr: '10'))
timestamps()
}

stages {
stage('Build') {
parallel {
stage('Windows') {
options {
timeout(time: 60, unit: 'MINUTES')
stage('docker-inbound-agent') {
failFast true
matrix {
axes {
axis {
name 'AGENT_TYPE'
values 'linux', 'windows-2019'
}
environment {
DOCKERHUB_ORGANISATION = "${infra.isTrusted() ? 'jenkins' : 'jenkins4eval'}"
}
stages {
stage('Build and Test') {
// This stage is the "CI" and should be run on all code changes triggered by a code change
when {
not { buildingTag() }
}
stages {
stage('Main') {
agent {
label env.AGENT_TYPE
}
options {
timeout(time: 30, unit: 'MINUTES')
}
environment {
DOCKERHUB_ORGANISATION = "${infra.isTrusted() ? 'jenkins' : 'jenkins4eval'}"
}
stages {
stage('Prepare Docker') {
when {
environment name: 'AGENT_TYPE', value: 'linux'
}
steps {
sh '''
docker buildx create --use
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
'''
}
}
steps {
script {
def parallelBuilds = [:]
def images = ['jdk11-windowsservercore-ltsc2019', 'jdk11-nanoserver-1809', 'jdk17-windowsservercore-ltsc2019', 'jdk17-nanoserver-1809']
for (unboundImage in images) {
def image = unboundImage // Bind variable before the closure
// Prepare a map of the steps to run in parallel
parallelBuilds[image] = {
// Allocate a node for each image to avoid filling disk
node('docker-windows') {
checkout scm
powershell '& ./make.ps1 -Build ' + image + ' test'
junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'target/**/junit-results.xml')
}
stage('Build and Test') {
// This stage is the "CI" and should be run on all code changes triggered by a code change
when {
not { buildingTag() }
}
steps {
script {
if(isUnix()) {
sh 'make build'
sh 'make test'
// If the tests are passing for Linux AMD64, then we can build all the CPU architectures
sh 'docker buildx bake --file docker-bake.hcl linux'
} else {
powershell "& ./build.ps1 test"
}
}
// Peform the parallel execution
parallel parallelBuilds
}
}
}
stage('Deploy to DockerHub') {
agent {
label 'docker-windows'
}
// This stage is the "CD" and should only be run when a tag triggered the build
when {
buildingTag()
}
steps {
script {
// This function is defined in the jenkins-infra/pipeline-library
infra.withDockerCredentials {
powershell '& ./make.ps1 -PushVersions -VersionTag $env:TAG_NAME publish'
post {
always {
junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'target/**/junit-results.xml')
}
}
}
}
}
}
stage('Linux') {
agent {
label "docker&&linux"
}
options {
timeout(time: 30, unit: 'MINUTES')
}
environment {
JENKINS_REPO = "${infra.isTrusted() ? 'jenkins' : 'jenkins4eval'}/inbound-agent"
}
stages {
stage('Prepare Docker') {
steps {
sh '''
docker buildx create --use
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
'''
}
}
stage('Build and Test') {
// This stage is the "CI" and should be run on all code changes triggered by a code change
when {
not { buildingTag() }
}
steps {
sh 'make build'
sh 'make test'
// If the tests are passing for Linux AMD64, then we can build all the CPU architectures
sh 'docker buildx bake --file docker-bake.hcl linux'
}
post {
always {
junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'target/*.xml')
stage('Deploy to DockerHub') {
// This stage is the "CD" and should only be run when a tag triggered the build
when {
buildingTag()
}
}
}
stage('Deploy to DockerHub') {
// This stage is the "CD" and should only be run when a tag triggered the build
when {
buildingTag()
}
steps {
script {
// This function is defined in the jenkins-infra/pipeline-library
infra.withDockerCredentials {
sh '''
export IMAGE_TAG="${TAG_NAME}"
export ON_TAG=true
docker buildx bake --push --file docker-bake.hcl linux
'''
steps {
script {
infra.withDockerCredentials {
if (isUnix()) {
sh '''
export IMAGE_TAG="${TAG_NAME}"
export ON_TAG=true
docker buildx bake --push --file docker-bake.hcl linux
'''
} else {
powershell "& ./build.ps1 -PushVersions -VersionTag $env:TAG_NAME publish"
}
}
}
}
}
Expand Down
33 changes: 33 additions & 0 deletions build-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
services:
jdk11-nanoserver:
image: jdk11-nanoserver-${NANOSERVER_VERSION_NAME}
build:
context: ./
dockerfile: ./windows/nanoserver/Dockerfile
args:
version: ${PARENT_IMAGE_VERSION}
WINDOWS_VERSION_TAG: ${NANOSERVER_VERSION_TAG}
jdk17-nanoserver:
image: jdk17-nanoserver-${NANOSERVER_VERSION_NAME}
build:
context: ./
dockerfile: ./windows/nanoserver/Dockerfile
args:
version: ${PARENT_IMAGE_VERSION}
WINDOWS_VERSION_TAG: ${NANOSERVER_VERSION_TAG}
jdk11-windowsservercore:
image: jdk11-windowsservercore-${WINDOWS_VERSION_NAME}
build:
context: ./
dockerfile: ./windows/windowsservercore/Dockerfile
args:
version: ${PARENT_IMAGE_VERSION}
WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG}
jdk17-windowsservercore:
image: jdk17-windowsservercore-${WINDOWS_VERSION_NAME}
build:
context: ./
dockerfile: ./windows/windowsservercore/Dockerfile
args:
version: ${PARENT_IMAGE_VERSION}
WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG}
Loading
Loading