Skip to content

Commit

Permalink
fix: use a fixed worker type for tests (#20130) (#20248)
Browse files Browse the repository at this point in the history 
# Conflicts:
#	Jenkinsfile
  • Loading branch information
@kuisathaverat
kuisathaverat authored Jul 28, 2020
1 parent 62768c6 commit abc3396
Showing 1 changed file with 24 additions and 24 deletions.
48 changes: 24 additions & 24 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import groovy.transform.Field
@Field def stashedTestReports = [:]

pipeline {
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
environment {
BASE_DIR = 'src/github.com/elastic/beats'
GOX_FLAGS = "-arch amd64"
Expand Down Expand Up @@ -84,7 +84,7 @@ pipeline {
failFast false
parallel {
stage('Elastic Agent x-pack'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand Down Expand Up @@ -131,7 +131,7 @@ pipeline {
}

stage('Filebeat oss'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand All @@ -144,7 +144,7 @@ pipeline {
}
}
stage('Filebeat x-pack'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand Down Expand Up @@ -219,7 +219,7 @@ pipeline {
}
}
stage('Heartbeat'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand Down Expand Up @@ -267,7 +267,7 @@ pipeline {
}
}
stage('Auditbeat oss Linux'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand All @@ -280,7 +280,7 @@ pipeline {
}
}
stage('Auditbeat crosscompile'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand Down Expand Up @@ -324,7 +324,7 @@ pipeline {
}
}
stage('Auditbeat x-pack'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand Down Expand Up @@ -363,7 +363,7 @@ pipeline {
}
}
stage('Libbeat'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand All @@ -390,7 +390,7 @@ pipeline {
}
}
stage('Libbeat x-pack'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand All @@ -403,7 +403,7 @@ pipeline {
}
}
stage('Metricbeat OSS Unit tests'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand All @@ -416,7 +416,7 @@ pipeline {
}
}
stage('Metricbeat OSS Integration tests'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand All @@ -429,7 +429,7 @@ pipeline {
}
}
stage('Metricbeat Python integration tests'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand All @@ -442,7 +442,7 @@ pipeline {
}
}
stage('Metricbeat x-pack'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand All @@ -452,7 +452,7 @@ pipeline {
}
stages {
stage('Prepare cloud integration tests environments'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
steps {
startCloudTestEnv('x-pack-metricbeat', [
Expand All @@ -461,7 +461,7 @@ pipeline {
}
}
stage('Metricbeat x-pack'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
steps {
withCloudTestEnv() {
Expand All @@ -477,7 +477,7 @@ pipeline {
}
}
stage('Metricbeat crosscompile'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand Down Expand Up @@ -547,7 +547,7 @@ pipeline {
}
}
stage('Packetbeat'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand All @@ -564,7 +564,7 @@ pipeline {
}
}
stage('dockerlogbeat'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand All @@ -581,7 +581,7 @@ pipeline {
}
}
stage('Winlogbeat'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand Down Expand Up @@ -624,7 +624,7 @@ pipeline {
}
}
stage('Functionbeat'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand Down Expand Up @@ -675,7 +675,7 @@ pipeline {
}
}
stage('Journalbeat'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand All @@ -692,7 +692,7 @@ pipeline {
}
}
stage('Generators'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand Down Expand Up @@ -764,7 +764,7 @@ pipeline {
}
}
stage('Kubernetes'){
agent { label 'ubuntu && immutable' }
agent { label 'ubuntu-18 && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
Expand Down

0 comments on commit abc3396

Please sign in to comment.