-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into prevent-common-code-to-import-server-or-pu…
…blic-code
- Loading branch information
Showing
950 changed files
with
44,137 additions
and
10,759 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,8 +12,7 @@ pipeline { | |
| environment { | ||
| BASE_DIR = 'src/github.com/elastic/kibana' | ||
| HOME = "${env.WORKSPACE}" | ||
| APM_ITS = 'apm-integration-testing' | ||
| CYPRESS_DIR = 'x-pack/plugins/apm/e2e' | ||
| E2E_DIR = 'x-pack/plugins/apm/e2e' | ||
| PIPELINE_LOG_LEVEL = 'DEBUG' | ||
| } | ||
| options { | ||
|
|
@@ -43,32 +42,6 @@ pipeline { | |
| env.APM_UPDATED = isGitRegionMatch(patterns: regexps) | ||
| } | ||
| } | ||
| dir("${APM_ITS}"){ | ||
| git changelog: false, | ||
| credentialsId: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba', | ||
| poll: false, | ||
| url: "[email protected]:elastic/${APM_ITS}.git" | ||
| } | ||
| } | ||
| } | ||
| stage('Start services') { | ||
| options { skipDefaultCheckout() } | ||
| when { | ||
| anyOf { | ||
| expression { return params.FORCE } | ||
| expression { return env.APM_UPDATED != "false" } | ||
| } | ||
| } | ||
| steps { | ||
| notifyStatus('Starting services', 'PENDING') | ||
| dir("${APM_ITS}"){ | ||
| sh './scripts/compose.py start master --no-kibana' | ||
| } | ||
| } | ||
| post { | ||
| unsuccessful { | ||
| notifyStatus('Environmental issue', 'FAILURE') | ||
| } | ||
| } | ||
| } | ||
| stage('Prepare Kibana') { | ||
|
|
@@ -85,7 +58,7 @@ pipeline { | |
| steps { | ||
| notifyStatus('Preparing kibana', 'PENDING') | ||
| dir("${BASE_DIR}"){ | ||
| sh script: "${CYPRESS_DIR}/ci/prepare-kibana.sh" | ||
| sh "${E2E_DIR}/ci/prepare-kibana.sh" | ||
| } | ||
| } | ||
| post { | ||
|
|
@@ -105,24 +78,20 @@ pipeline { | |
| steps{ | ||
| notifyStatus('Running smoke tests', 'PENDING') | ||
| dir("${BASE_DIR}"){ | ||
| sh ''' | ||
| jobs -l | ||
| docker build --tag cypress --build-arg NODE_VERSION=$(cat .node-version) ${CYPRESS_DIR}/ci | ||
| docker run --rm -t --user "$(id -u):$(id -g)" \ | ||
| -v `pwd`:/app --network="host" \ | ||
| --name cypress cypress''' | ||
| sh "${E2E_DIR}/ci/run-e2e.sh" | ||
| } | ||
| } | ||
| post { | ||
| always { | ||
| dir("${BASE_DIR}"){ | ||
| archiveArtifacts(allowEmptyArchive: false, artifacts: "${CYPRESS_DIR}/**/screenshots/**,${CYPRESS_DIR}/**/videos/**,${CYPRESS_DIR}/**/test-results/*e2e-tests.xml") | ||
| junit(allowEmptyResults: true, testResults: "${CYPRESS_DIR}/**/test-results/*e2e-tests.xml") | ||
| } | ||
| dir("${APM_ITS}"){ | ||
| sh 'docker-compose logs > apm-its.log || true' | ||
| sh 'docker-compose down -v || true' | ||
| archiveArtifacts(allowEmptyArchive: false, artifacts: 'apm-its.log') | ||
| dir("${BASE_DIR}/${E2E_DIR}"){ | ||
| archiveArtifacts(allowEmptyArchive: false, artifacts: 'cypress/screenshots/**,cypress/videos/**,cypress/test-results/*e2e-tests.xml') | ||
| junit(allowEmptyResults: true, testResults: 'cypress/test-results/*e2e-tests.xml') | ||
| dir('tmp/apm-integration-testing'){ | ||
| sh 'docker-compose logs > apm-its-docker.log || true' | ||
| sh 'docker-compose down -v || true' | ||
| archiveArtifacts(allowEmptyArchive: true, artifacts: 'apm-its-docker.log') | ||
| } | ||
| archiveArtifacts(allowEmptyArchive: true, artifacts: 'tmp/*.log') | ||
| } | ||
| } | ||
| unsuccessful { | ||
|
|
@@ -137,7 +106,7 @@ pipeline { | |
| post { | ||
| always { | ||
| dir("${BASE_DIR}"){ | ||
| archiveArtifacts(allowEmptyArchive: true, artifacts: "${CYPRESS_DIR}/ingest-data.log,kibana.log") | ||
| archiveArtifacts(allowEmptyArchive: true, artifacts: "${E2E_DIR}/kibana.log") | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.