Skip to content
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.

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

[CI] [6.8] Pipeline backports #72293

Merged
merged 8 commits into from
Jul 23, 2020

Conversation

brianseeders
Copy link
Contributor

@brianseeders brianseeders commented Jul 17, 2020

Closes #69964

I checked out 6.8, copied over all of the Pipeline-related files from master, and then removed the tasks and such not relevant for 6.8. All of the pipeline files are really close to what they are in master now, which should make backporting easier.

The test results in Jenkins for the PR match the base branch, and GCS uploads look good.

This should bring a bunch of fixes, some big and some small, e.g. slack notifications not working at all for 6.8.

If you want to actually review the changes, my recommendation would be to diff vars/, Jenkinsfile, and .ci/es-snapshots against master. The changes are really minimal.

Here's vars/:

--- a/vars/kibanaPipeline.groovy
+++ b/vars/kibanaPipeline.groovy
@@ -2,9 +2,10 @@ def withPostBuildReporting(Closure closure) {
   try {
     closure()
   } finally {
-    catchErrors {
-      runErrorReporter()
-    }
+    // disabled in 6.8
+    // catchErrors {
+    //   runErrorReporter()
+    // }

     catchErrors {
       runbld.junit()
@@ -25,6 +26,7 @@ def functionalTestProcess(String name, Closure closure) {

     withEnv([
       "CI_PARALLEL_PROCESS_NUMBER=${processNumber}",
+      "PARALLEL_PIPELINE_WORKER_INDEX=${processNumber}",
       "TEST_KIBANA_HOST=localhost",
       "TEST_KIBANA_PORT=${kibanaPort}",
       "TEST_KIBANA_URL=http://elastic:changeme@localhost:${kibanaPort}",
@@ -203,13 +205,10 @@ def buildXpack() {
 }

 def runErrorReporter() {
-  def status = buildUtils.getBuildStatus()
-  def dryRun = status != "ABORTED" ? "" : "--no-github-update"
-
   bash(
     """
       source src/dev/ci_setup/setup_env.sh
-      node scripts/report_failed_tests ${dryRun} target/junit/**/*.xml
+      node src/dev/failed_tests/cli
     """,
     "Report failed tests, if necessary"
   )

@brianseeders brianseeders added release_note:skip Skip the PR/issue when compiling release notes v6.8.11 labels Jul 17, 2020
@brianseeders
Copy link
Contributor Author

@elasticmachine merge upstream

@brianseeders brianseeders marked this pull request as ready for review July 23, 2020 15:07
@brianseeders
Copy link
Contributor Author

@elasticmachine merge upstream

@brianseeders brianseeders requested a review from a team July 23, 2020 15:14
@brianseeders brianseeders added backport Feature:CI Continuous integration labels Jul 23, 2020
@brianseeders brianseeders self-assigned this Jul 23, 2020
@brianseeders brianseeders changed the title [CI] Pipeline backports [CI] [6.8] Pipeline backports Jul 23, 2020
Copy link
Contributor

@spalger spalger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One minor request, but LGTM

vars/githubPr.groovy Outdated Show resolved Hide resolved
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@brianseeders brianseeders merged commit ff81d1b into elastic:6.8 Jul 23, 2020
@brianseeders brianseeders deleted the 68-pipeline-backports branch July 23, 2020 18:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Feature:CI Continuous integration release_note:skip Skip the PR/issue when compiling release notes v6.8.11
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants