Skip to content

Commit 5da9133

Browse files
authored
.ci: remove End-to-End Integration Tests stage (#2802)
1 parent 0173beb commit 5da9133

File tree

1 file changed

+1
-31
lines changed

1 file changed

+1
-31
lines changed

Jenkinsfile

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ pipeline {
1212
DOCKERHUB_SECRET = 'secret/apm-team/ci/elastic-observability-dockerhub'
1313
ELASTIC_DOCKER_SECRET = 'secret/apm-team/ci/docker-registry/prod'
1414
CODECOV_SECRET = 'secret/apm-team/ci/apm-agent-java-codecov'
15-
GITHUB_CHECK_ITS_NAME = 'End-To-End Integration Tests'
16-
ITS_PIPELINE = 'apm-integration-tests-selector-mbp/main'
1715
MAVEN_CONFIG = '-Dmaven.repo.local=.m2'
1816
JAVA_VERSION = "${params.JAVA_VERSION}"
1917
JOB_GCS_BUCKET_STASH = 'apm-ci-temp'
@@ -30,7 +28,7 @@ pipeline {
3028
quietPeriod(10)
3129
}
3230
triggers {
33-
issueCommentTrigger("(${obltGitHubComments()}|^run (jdk compatibility|benchmark|integration|end-to-end|windows) tests)")
31+
issueCommentTrigger("(${obltGitHubComments()}|^run (jdk compatibility|benchmark|integration|windows) tests)")
3432
}
3533
parameters {
3634
string(name: 'JAVA_VERSION', defaultValue: 'java11', description: 'Java version to build & test')
@@ -50,10 +48,6 @@ pipeline {
5048
// opt-in with 'ci:agent-integration'
5149
booleanParam(name: 'agent_integration_tests_ci', defaultValue: false, description: 'Enable Agent Integration tests')
5250

53-
// disabled by default, but required for merge, GH check name is ${GITHUB_CHECK_ITS_NAME}
54-
// opt-in with 'ci:end-to-end' tag on PR
55-
booleanParam(name: 'end_to_end_tests_ci', defaultValue: false, description: 'Enable APM End-to-End tests')
56-
5751
// disabled by default, not required for merge
5852
// opt-in with 'ci:benchmarks' tag on PR
5953
booleanParam(name: 'bench_ci', defaultValue: false, description: 'Enable benchmarks')
@@ -354,30 +348,6 @@ pipeline {
354348
}
355349
}
356350
}
357-
stage('End-To-End Integration Tests') {
358-
agent none
359-
when {
360-
allOf {
361-
expression { return env.ONLY_DOCS == "false" }
362-
anyOf {
363-
expression { return params.end_to_end_tests_ci }
364-
expression { return env.GITHUB_COMMENT?.contains('end-to-end tests') }
365-
expression { matchesPrLabel(label: 'ci:end-to-end') }
366-
expression { return env.CHANGE_ID != null && !pullRequest.draft }
367-
not { changeRequest() }
368-
}
369-
}
370-
}
371-
steps {
372-
build(job: env.ITS_PIPELINE, propagate: false, wait: false,
373-
parameters: [string(name: 'INTEGRATION_TEST', value: 'Java'),
374-
string(name: 'BUILD_OPTS', value: "--java-agent-version ${env.GIT_BASE_COMMIT} --opbeans-java-agent-branch ${env.GIT_BASE_COMMIT}"),
375-
string(name: 'GITHUB_CHECK_NAME', value: env.GITHUB_CHECK_ITS_NAME),
376-
string(name: 'GITHUB_CHECK_REPO', value: env.REPO),
377-
string(name: 'GITHUB_CHECK_SHA1', value: env.GIT_BASE_COMMIT)])
378-
githubNotify(context: "${env.GITHUB_CHECK_ITS_NAME}", description: "${env.GITHUB_CHECK_ITS_NAME} ...", status: 'PENDING', targetUrl: "${env.JENKINS_URL}search/?q=${env.ITS_PIPELINE.replaceAll('/','+')}")
379-
}
380-
}
381351
stage('JDK Compatibility Tests') {
382352
options { skipDefaultCheckout() }
383353
when {

0 commit comments

Comments
 (0)