Skip to content

ci(jenkins): reuse agents (4 less agents to be used) #606

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

Merged
merged 4 commits into from
Oct 10, 2019
Merged

ci(jenkins): reuse agents (4 less agents to be used) #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30b43cf
ci(jenkins): reuse agents (4 less agents to be used)
v1v Oct 9, 2019
3edcf5c
chore: for testing purposes only
v1v Oct 9, 2019
e899560
Revert "chore: for testing purposes only"
v1v Oct 9, 2019
3ab3b03
Merge branch 'master' into feature/optimise_agents
v1v Oct 10, 2019
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: 1 addition & 5 deletions .ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import co.elastic.matrix.*

pipeline {
agent any
agent { label 'linux && immutable' }
environment {
BASE_DIR="src/github.com/elastic/apm-agent-python"
PIPELINE_LOG_LEVEL='INFO'
Expand All @@ -26,7 +26,6 @@ pipeline {
}
stages {
stage('Initializing'){
agent { label 'docker && linux && immutable' }
options { skipDefaultCheckout() }
environment {
HOME = "${env.WORKSPACE}"
Expand Down Expand Up @@ -73,7 +72,6 @@ pipeline {
Execute unit tests.
*/
stage('Test') {
agent { label 'linux && immutable' }
options {
timeout(time: 1, unit: 'HOURS')
skipDefaultCheckout()
Expand All @@ -96,7 +94,6 @@ pipeline {
}
}
stage('Building packages') {
agent { label 'docker && linux && immutable' }
options {
timeout(time: 1, unit: 'HOURS')
skipDefaultCheckout()
Expand All @@ -119,7 +116,6 @@ pipeline {
}
}
stage('Release') {
agent { label 'linux && immutable' }
options {
skipDefaultCheckout()
timeout(time: 12, unit: 'HOURS')
Expand Down
4 changes: 1 addition & 3 deletions .ci/downstreamTests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ it is need as field to store the results of the tests.
@Field def pythonTasksGen

pipeline {
agent any
agent { label 'linux && immutable' }
environment {
REPO="git@github.com:elastic/apm-agent-python.git"
BASE_DIR="src/github.com/elastic/apm-agent-python"
Expand Down Expand Up @@ -41,7 +41,6 @@ pipeline {
Checkout the code and stash it, to use it on other stages.
*/
stage('Checkout') {
agent { label 'docker && linux && immutable' }
options { skipDefaultCheckout() }
steps {
script {
Expand All @@ -64,7 +63,6 @@ pipeline {
Execute unit tests.
*/
stage('Test') {
agent { label 'linux && immutable' }
options { skipDefaultCheckout() }
steps {
deleteDir()
Expand Down
3 changes: 1 addition & 2 deletions .ci/linting.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@Library('apm@current') _

pipeline {
agent any
agent { label 'linux && immutable' }
options {
buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20', daysToKeepStr: '30'))
timestamps()
Expand All @@ -17,7 +17,6 @@ pipeline {
}
stages {
stage('Sanity checks') {
agent { label 'docker && linux && immutable' }
environment {
HOME = "${env.WORKSPACE}"
PATH = "${env.PATH}:${env.WORKSPACE}/bin"
Expand Down
6 changes: 1 addition & 5 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ it is need as field to store the results of the tests.
@Field def pythonTasksGen

pipeline {
agent any
agent { label 'linux && immutable' }
environment {
REPO = 'apm-agent-python'
BASE_DIR = "src/github.com/elastic/${env.REPO}"
Expand Down Expand Up @@ -40,7 +40,6 @@ pipeline {
}
stages {
stage('Initializing'){
agent { label 'docker && linux && immutable' }
options { skipDefaultCheckout() }
environment {
HOME = "${env.WORKSPACE}"
Expand Down Expand Up @@ -87,7 +86,6 @@ pipeline {
Execute unit tests.
*/
stage('Test') {
agent { label 'linux && immutable' }
options { skipDefaultCheckout() }
steps {
withGithubNotify(context: 'Test', tab: 'tests') {
Expand All @@ -113,7 +111,6 @@ pipeline {
}
}
stage('Building packages') {
agent { label 'docker && linux && immutable' }
options { skipDefaultCheckout() }
environment {
HOME = "${env.WORKSPACE}"
Expand Down Expand Up @@ -155,7 +152,6 @@ pipeline {
}
}
stage('Release') {
agent { label 'linux && immutable' }
options { skipDefaultCheckout() }
environment {
HOME = "${env.WORKSPACE}"
Expand Down