From 512a9aa71014289d50c5792903c35fac28af12d0 Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Wed, 17 Mar 2021 14:54:44 +0000
Subject: [PATCH 01/10] [CI] single pipeline to run mvn verify on windows

---
 .ci/jobs/apm-agent-java-windows.yml | 35 +++++++++++++
 .ci/windows.groovy                  | 80 +++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 .ci/jobs/apm-agent-java-windows.yml
 create mode 100644 .ci/windows.groovy

diff --git a/.ci/jobs/apm-agent-java-windows.yml b/.ci/jobs/apm-agent-java-windows.yml
new file mode 100644
index 0000000000..0ba397cafd
--- /dev/null
+++ b/.ci/jobs/apm-agent-java-windows.yml
@@ -0,0 +1,35 @@
+---
+- job:
+    name: apm-agent-java/apm-agent-java-windows
+    display-name: APM Agent Java on Windows
+    description: APM Agent Java on Windows
+    view: APM-CI
+    project-type: pipeline
+    parameters:
+      - string:
+          name: REFSPEC
+          default: master
+          description: What git reference?
+      - string:
+          name: JAVA_VERSION
+          default: java11
+          description: What Java version?
+      - string:
+          name: MAVEN_CONFIG
+          default: -V -B 
+          description: Additional maven options.
+    pipeline-scm:
+      script-path: .ci/windows.groovy
+      scm:
+        - git:
+            url: git@github.com:elastic/apm-pipeline-library.git
+            refspec: +refs/heads/*:refs/remotes/origin/* +refs/pull/*/head:refs/remotes/origin/pr/*
+            wipe-workspace: 'True'
+            name: origin
+            shallow-clone: true
+            credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
+            reference-repo: /var/lib/jenkins/.git-references/apm-pipeline-library.git
+            branches:
+              - $REFSPEC
+    triggers:
+      - timed: 'H H(1-4) * * 0'
diff --git a/.ci/windows.groovy b/.ci/windows.groovy
new file mode 100644
index 0000000000..879faf0a24
--- /dev/null
+++ b/.ci/windows.groovy
@@ -0,0 +1,80 @@
+#!/usr/bin/env groovy
+
+@Library('apm@current') _
+
+pipeline {
+  agent { label 'windows-2019-docker-immutable' }
+  environment {
+    REPO = 'apm-agent-java'
+    BASE_DIR = "src/github.com/elastic/${env.REPO}"
+    NOTIFY_TO = credentials('notify-to')
+    MAVEN_CONFIG = "${params.MAVEN_CONFIG} -Dmaven.repo.local=.m2"
+    JAVA_VERSION = "${params.JAVA_VERSION}"
+    REFSPEC = "${params.REFSPEC}"
+  }
+  options {
+    timeout(time: 2, unit: 'HOURS')
+    buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20', daysToKeepStr: '30'))
+    timestamps()
+    ansiColor('xterm')
+    disableResume()
+    durabilityHint('PERFORMANCE_OPTIMIZED')
+    rateLimitBuilds(throttle: [count: 60, durationName: 'hour', userBoost: true])
+    quietPeriod(10)
+  }
+  triggers {
+    cron('H H(4-5) * * 0')
+  }
+  parameters {
+    string(name: 'REFSPEC', defaultValue: 'master', description: 'What git reference?')
+    string(name: 'JAVA_VERSION', defaultValue: 'java11', description: 'What Java version?')
+    string(name: 'MAVEN_CONFIG', defaultValue: '-V -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dhttps.protocols=TLSv1.2 -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25', description: 'Additional maven options.')
+  }
+  stages {
+    stage('Checkout') {
+      steps {
+        deleteDir()
+        gitCheckout(basedir: "${BASE_DIR}", githubNotifyFirstTimeContributor: true, shallow: false,
+                    branch: "${REFSPEC}", reference: '/var/lib/jenkins/.git-references/apm-agent-java.git')
+      }
+    }
+    stage('Windows Build') {
+      steps {
+        withGithubNotify(context: 'Windows Build') {
+          deleteDir()
+          unstash 'source'
+          dir("${BASE_DIR}"){
+            retryWithSleep(retries: 5, seconds: 10) {
+              bat "mvnw clean install -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.gitcommitid.skip=true"
+            }
+          }
+        }
+      }
+    }
+    stage('Windows Verify') {
+      steps {
+        withGithubNotify(context: 'Windows Verify', tab: 'tests') {
+          dir("${BASE_DIR}"){
+            bat "mvnw verify"
+          }
+        }
+      }
+      post {
+        always {
+          junit(allowEmptyResults: true, keepLongStdio: true, testResults: "${BASE_DIR}/**/junit-*.xml,${BASE_DIR}/**/TEST-*.xml")
+        }
+      }
+    }
+  }
+  post {
+    cleanup {
+      notifyBuildResult()
+    }
+    unsuccessful {
+      slackSend(channel: '#apm-agent-java',
+                color: 'danger',
+                message: "[${env.REPO}] Windows build failed. (<${env.RUN_DISPLAY_URL}|Open>)",
+                tokenCredentialId: 'jenkins-slack-integration-token')
+    }
+  }
+}

From 2997dfc6242a7abc196b4e7e91446f687239d30f Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Wed, 17 Mar 2021 14:59:06 +0000
Subject: [PATCH 02/10] Remove GH commit staus since it is not a MBP

---
 .ci/windows.groovy | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/.ci/windows.groovy b/.ci/windows.groovy
index 879faf0a24..35ba6e922d 100644
--- a/.ci/windows.groovy
+++ b/.ci/windows.groovy
@@ -40,23 +40,19 @@ pipeline {
     }
     stage('Windows Build') {
       steps {
-        withGithubNotify(context: 'Windows Build') {
-          deleteDir()
-          unstash 'source'
-          dir("${BASE_DIR}"){
-            retryWithSleep(retries: 5, seconds: 10) {
-              bat "mvnw clean install -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.gitcommitid.skip=true"
-            }
+        deleteDir()
+        unstash 'source'
+        dir("${BASE_DIR}"){
+          retryWithSleep(retries: 5, seconds: 10) {
+            bat "mvnw clean install -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.gitcommitid.skip=true"
           }
         }
       }
     }
     stage('Windows Verify') {
       steps {
-        withGithubNotify(context: 'Windows Verify', tab: 'tests') {
-          dir("${BASE_DIR}"){
-            bat "mvnw verify"
-          }
+        dir("${BASE_DIR}"){
+          bat "mvnw verify"
         }
       }
       post {

From dc9ab33b5f4a426742ec1b0f6006d9f5e71241f4 Mon Sep 17 00:00:00 2001
From: Victor Martinez <victormartinezrubio@gmail.com>
Date: Wed, 24 Mar 2021 15:35:41 +0000
Subject: [PATCH 03/10] Update .ci/jobs/apm-agent-java-windows.yml

---
 .ci/jobs/apm-agent-java-windows.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/jobs/apm-agent-java-windows.yml b/.ci/jobs/apm-agent-java-windows.yml
index 0ba397cafd..7e4c366f21 100644
--- a/.ci/jobs/apm-agent-java-windows.yml
+++ b/.ci/jobs/apm-agent-java-windows.yml
@@ -22,13 +22,13 @@
       script-path: .ci/windows.groovy
       scm:
         - git:
-            url: git@github.com:elastic/apm-pipeline-library.git
+            url: git@github.com:elastic/apm-agent-java.git
             refspec: +refs/heads/*:refs/remotes/origin/* +refs/pull/*/head:refs/remotes/origin/pr/*
             wipe-workspace: 'True'
             name: origin
             shallow-clone: true
             credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
-            reference-repo: /var/lib/jenkins/.git-references/apm-pipeline-library.git
+            reference-repo: /var/lib/jenkins/.git-references/apm-agent-java.git
             branches:
               - $REFSPEC
     triggers:

From cc5dce4e9b1c6f297349a58bdd2d21b0869557c8 Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Mon, 2 Aug 2021 10:40:59 +0100
Subject: [PATCH 04/10] Enable weekly windows builds within the same default
 pipeline

---
 .ci/schedule-weekly.groovy | 15 ++++++++
 .ci/windows.groovy         | 76 --------------------------------------
 Jenkinsfile                | 52 +++++++++++++++++++++++++-
 3 files changed, 66 insertions(+), 77 deletions(-)
 delete mode 100644 .ci/windows.groovy

diff --git a/.ci/schedule-weekly.groovy b/.ci/schedule-weekly.groovy
index 4591877c8e..c79f53561d 100644
--- a/.ci/schedule-weekly.groovy
+++ b/.ci/schedule-weekly.groovy
@@ -30,6 +30,21 @@ pipeline {
         )
       }
     }
+    stage('Run windows tests') {
+      steps {
+        build(job: 'apm-agent-java/apm-agent-java-mbp/master',
+          parameters: [
+            booleanParam(name: 'windows_ci', value: true),
+            booleanParam(name: 'Run_As_Master_Branch', value: false),
+            booleanParam(name: 'smoketests_ci', value: false),
+            booleanParam(name: 'bench_ci', value: false),
+            booleanParam(name: 'test_ci', value: false)
+          ],
+          propagate: false,
+          wait: false
+        )
+      }
+    }
   }
   post {
     cleanup {
diff --git a/.ci/windows.groovy b/.ci/windows.groovy
deleted file mode 100644
index 35ba6e922d..0000000000
--- a/.ci/windows.groovy
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env groovy
-
-@Library('apm@current') _
-
-pipeline {
-  agent { label 'windows-2019-docker-immutable' }
-  environment {
-    REPO = 'apm-agent-java'
-    BASE_DIR = "src/github.com/elastic/${env.REPO}"
-    NOTIFY_TO = credentials('notify-to')
-    MAVEN_CONFIG = "${params.MAVEN_CONFIG} -Dmaven.repo.local=.m2"
-    JAVA_VERSION = "${params.JAVA_VERSION}"
-    REFSPEC = "${params.REFSPEC}"
-  }
-  options {
-    timeout(time: 2, unit: 'HOURS')
-    buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20', daysToKeepStr: '30'))
-    timestamps()
-    ansiColor('xterm')
-    disableResume()
-    durabilityHint('PERFORMANCE_OPTIMIZED')
-    rateLimitBuilds(throttle: [count: 60, durationName: 'hour', userBoost: true])
-    quietPeriod(10)
-  }
-  triggers {
-    cron('H H(4-5) * * 0')
-  }
-  parameters {
-    string(name: 'REFSPEC', defaultValue: 'master', description: 'What git reference?')
-    string(name: 'JAVA_VERSION', defaultValue: 'java11', description: 'What Java version?')
-    string(name: 'MAVEN_CONFIG', defaultValue: '-V -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dhttps.protocols=TLSv1.2 -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25', description: 'Additional maven options.')
-  }
-  stages {
-    stage('Checkout') {
-      steps {
-        deleteDir()
-        gitCheckout(basedir: "${BASE_DIR}", githubNotifyFirstTimeContributor: true, shallow: false,
-                    branch: "${REFSPEC}", reference: '/var/lib/jenkins/.git-references/apm-agent-java.git')
-      }
-    }
-    stage('Windows Build') {
-      steps {
-        deleteDir()
-        unstash 'source'
-        dir("${BASE_DIR}"){
-          retryWithSleep(retries: 5, seconds: 10) {
-            bat "mvnw clean install -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.gitcommitid.skip=true"
-          }
-        }
-      }
-    }
-    stage('Windows Verify') {
-      steps {
-        dir("${BASE_DIR}"){
-          bat "mvnw verify"
-        }
-      }
-      post {
-        always {
-          junit(allowEmptyResults: true, keepLongStdio: true, testResults: "${BASE_DIR}/**/junit-*.xml,${BASE_DIR}/**/TEST-*.xml")
-        }
-      }
-    }
-  }
-  post {
-    cleanup {
-      notifyBuildResult()
-    }
-    unsuccessful {
-      slackSend(channel: '#apm-agent-java',
-                color: 'danger',
-                message: "[${env.REPO}] Windows build failed. (<${env.RUN_DISPLAY_URL}|Open>)",
-                tokenCredentialId: 'jenkins-slack-integration-token')
-    }
-  }
-}
diff --git a/Jenkinsfile b/Jenkinsfile
index 2d87f405f9..afadad480d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,7 +28,7 @@ pipeline {
     quietPeriod(10)
   }
   triggers {
-    issueCommentTrigger('(?i)(.*(?:jenkins\\W+)?run\\W+(?:the\\W+)?(?:(compatibility|benchmark)\\W+)?tests(?:\\W+please)?.*|^/test(?:\\W+.*)?$)')
+    issueCommentTrigger('(?i)(.*(?:jenkins\\W+)?run\\W+(?:the\\W+)?(?:(compatibility|benchmark|windows)\\W+)?tests(?:\\W+please)?.*|^/test(?:\\W+.*)?$)')
   }
   parameters {
     string(name: 'MAVEN_CONFIG', defaultValue: '-V -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dhttps.protocols=TLSv1.2 -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25', description: 'Additional maven options.')
@@ -38,6 +38,7 @@ pipeline {
     booleanParam(name: 'bench_ci', defaultValue: true, description: 'Enable benchmarks')
     booleanParam(name: 'push_docker', defaultValue: false, description: 'Push Docker image during release stage')
     booleanParam(name: 'compatibility_ci', defaultValue: false, description: 'Enable compatibility tests')
+    booleanParam(name: 'windows_ci', defaultValue: false, description: 'Enable windows build and tests')
   }
   stages {
     stage('Initializing'){
@@ -284,6 +285,55 @@ pipeline {
         }
       }
     }
+    stage('Windows') {
+      options { skipDefaultCheckout() }
+      agent { label 'windows-2019-docker-immutable' }
+      when {
+        beforeAgent true
+        anyOf {
+          not { changeRequest() }
+          expression { return params.windows_ci }
+          expression { return env.GITHUB_COMMENT?.contains('windows tests') }
+        }
+      }
+      stages {
+        stage('Windows Build') {
+          steps {
+            withGithubNotify(context: "Windows build") {
+              deleteDir()
+              unstash 'source'
+              dir("${BASE_DIR}"){
+                retryWithSleep(retries: 5, seconds: 10) {
+                  bat "mvnw clean install -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.gitcommitid.skip=true"
+                }
+              }
+            }
+          }
+        }
+        stage('Windows Verify') {
+          steps {
+            withGithubNotify(context: "Windows verify") {
+              dir("${BASE_DIR}"){
+                bat "mvnw verify"
+              }
+            }
+          }
+          post {
+            always {
+              junit(allowEmptyResults: true, keepLongStdio: true, testResults: "${BASE_DIR}/**/junit-*.xml,${BASE_DIR}/**/TEST-*.xml")
+            }
+          }
+        }
+      }
+      post {
+        unsuccessful {
+          slackSend(channel: '#apm-agent-java',
+                    color: 'danger',
+                    message: "[${env.REPO}] Windows build failed. (<${env.RUN_DISPLAY_URL}|Open>)",
+                    tokenCredentialId: 'jenkins-slack-integration-token')
+        }
+      }
+    }
     stage('Integration Tests') {
       agent none
       when {

From 323b21d5b7aca39dba5031b58caedda42bcafdba Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Mon, 2 Aug 2021 10:45:08 +0100
Subject: [PATCH 05/10] Refactor

---
 Jenkinsfile | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index afadad480d..c54a2ed7be 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,6 +16,7 @@ pipeline {
     ITS_PIPELINE = 'apm-integration-tests-selector-mbp/master'
     MAVEN_CONFIG = '-Dmaven.repo.local=.m2'
     OPBEANS_REPO = 'opbeans-java'
+    JAVA_VERSION = "${params.JAVA_VERSION}"
   }
   options {
     timeout(time: 1, unit: 'HOURS')
@@ -32,6 +33,7 @@ pipeline {
   }
   parameters {
     string(name: 'MAVEN_CONFIG', defaultValue: '-V -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dhttps.protocols=TLSv1.2 -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25', description: 'Additional maven options.')
+    string(name: 'JAVA_VERSION', defaultValue: 'java11', description: 'What Java version?')
     booleanParam(name: 'Run_As_Master_Branch', defaultValue: false, description: 'Allow to run any steps on a PR, some steps normally only run on master branch.')
     booleanParam(name: 'test_ci', defaultValue: true, description: 'Enable test')
     booleanParam(name: 'smoketests_ci', defaultValue: true, description: 'Enable Smoke tests')
@@ -45,7 +47,7 @@ pipeline {
       options { skipDefaultCheckout() }
       environment {
         HOME = "${env.WORKSPACE}"
-        JAVA_HOME = "${env.HUDSON_HOME}/.java/java11"
+        JAVA_HOME = "${env.HUDSON_HOME}/.java/${env.JAVA_VERSION}"
         PATH = "${env.JAVA_HOME}/bin:${env.PATH}"
         MAVEN_CONFIG = "${params.MAVEN_CONFIG} ${env.MAVEN_CONFIG}"
       }
@@ -119,7 +121,7 @@ pipeline {
           options { skipDefaultCheckout() }
           environment {
             HOME = "${env.WORKSPACE}"
-            JAVA_HOME = "${env.HUDSON_HOME}/.java/java11"
+            JAVA_HOME = "${env.HUDSON_HOME}/.java/${env.JAVA_VERSION}"
             PATH = "${env.JAVA_HOME}/bin:${env.PATH}"
           }
           when {
@@ -152,7 +154,7 @@ pipeline {
           options { skipDefaultCheckout() }
           environment {
             HOME = "${env.WORKSPACE}"
-            JAVA_HOME = "${env.HUDSON_HOME}/.java/java11"
+            JAVA_HOME = "${env.HUDSON_HOME}/.java/${env.JAVA_VERSION}"
             PATH = "${env.JAVA_HOME}/bin:${env.PATH}"
           }
           when {
@@ -182,7 +184,7 @@ pipeline {
           options { skipDefaultCheckout() }
           environment {
             HOME = "${env.WORKSPACE}"
-            JAVA_HOME = "${env.HUDSON_HOME}/.java/java11"
+            JAVA_HOME = "${env.HUDSON_HOME}/.java/${env.JAVA_VERSION}"
             PATH = "${env.JAVA_HOME}/bin:${env.PATH}"
           }
           when {
@@ -213,7 +215,7 @@ pipeline {
           options { skipDefaultCheckout() }
           environment {
             HOME = "${env.WORKSPACE}"
-            JAVA_HOME = "${env.HUDSON_HOME}/.java/java11"
+            JAVA_HOME = "${env.HUDSON_HOME}/.java/${env.JAVA_VERSION}"
             PATH = "${env.JAVA_HOME}/bin:${env.PATH}"
             NO_BUILD = "true"
           }
@@ -263,7 +265,7 @@ pipeline {
           options { skipDefaultCheckout() }
           environment {
             HOME = "${env.WORKSPACE}"
-            JAVA_HOME = "${env.HUDSON_HOME}/.java/java11"
+            JAVA_HOME = "${env.HUDSON_HOME}/.java/${env.JAVA_VERSION}"
             PATH = "${env.JAVA_HOME}/bin:${env.PATH}"
           }
           when {
@@ -288,6 +290,10 @@ pipeline {
     stage('Windows') {
       options { skipDefaultCheckout() }
       agent { label 'windows-2019-docker-immutable' }
+      environment {
+        JAVA_HOME = "C:\\Users\\jenkins\\.java\\${env.JAVA_VERSION}"
+        PATH = "${env.JAVA_HOME}\\bin;${env.PATH}"
+      }
       when {
         beforeAgent true
         anyOf {
@@ -299,7 +305,7 @@ pipeline {
       stages {
         stage('Windows Build') {
           steps {
-            withGithubNotify(context: "Windows build") {
+            withGithubNotify(context: 'Windows Build') {
               deleteDir()
               unstash 'source'
               dir("${BASE_DIR}"){
@@ -312,15 +318,15 @@ pipeline {
         }
         stage('Windows Verify') {
           steps {
-            withGithubNotify(context: "Windows verify") {
+            withGithubNotify(context: 'Windows Tests', tab: 'tests') {
               dir("${BASE_DIR}"){
-                bat "mvnw verify"
+                bat "mvnw test"
               }
             }
           }
           post {
             always {
-              junit(allowEmptyResults: true, keepLongStdio: true, testResults: "${BASE_DIR}/**/junit-*.xml,${BASE_DIR}/**/TEST-*.xml")
+              reportTestResultsOnly()
             }
           }
         }
@@ -453,8 +459,12 @@ pipeline {
 }
 
 def reportTestResults(){
+  reportTestResultsOnly()
+  codecov(repo: env.REPO, basedir: "${BASE_DIR}", secret: "${CODECOV_SECRET}")
+}
+
+def reportTestResultsOnly(){
   junit(allowEmptyResults: true,
     keepLongStdio: true,
     testResults: "${BASE_DIR}/**/junit-*.xml,${BASE_DIR}/**/TEST-*.xml")
-  codecov(repo: env.REPO, basedir: "${BASE_DIR}", secret: "${CODECOV_SECRET}")
 }

From c76200084a93b1557982b2a9ad586c5d7374ca7b Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Mon, 2 Aug 2021 10:46:43 +0100
Subject: [PATCH 06/10] Use verify

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c54a2ed7be..90745c070d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -318,9 +318,9 @@ pipeline {
         }
         stage('Windows Verify') {
           steps {
-            withGithubNotify(context: 'Windows Tests', tab: 'tests') {
+            withGithubNotify(context: 'Windows Verify', tab: 'tests') {
               dir("${BASE_DIR}"){
-                bat "mvnw test"
+                bat "mvnw verify"
               }
             }
           }

From ed90c1ca74c95e7f2faf7277ec47ad2e3ef0fddf Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Mon, 2 Aug 2021 10:47:07 +0100
Subject: [PATCH 07/10] use the weekly one

---
 .ci/jobs/apm-agent-java-windows.yml | 35 -----------------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 .ci/jobs/apm-agent-java-windows.yml

diff --git a/.ci/jobs/apm-agent-java-windows.yml b/.ci/jobs/apm-agent-java-windows.yml
deleted file mode 100644
index 7e4c366f21..0000000000
--- a/.ci/jobs/apm-agent-java-windows.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-- job:
-    name: apm-agent-java/apm-agent-java-windows
-    display-name: APM Agent Java on Windows
-    description: APM Agent Java on Windows
-    view: APM-CI
-    project-type: pipeline
-    parameters:
-      - string:
-          name: REFSPEC
-          default: master
-          description: What git reference?
-      - string:
-          name: JAVA_VERSION
-          default: java11
-          description: What Java version?
-      - string:
-          name: MAVEN_CONFIG
-          default: -V -B 
-          description: Additional maven options.
-    pipeline-scm:
-      script-path: .ci/windows.groovy
-      scm:
-        - git:
-            url: git@github.com:elastic/apm-agent-java.git
-            refspec: +refs/heads/*:refs/remotes/origin/* +refs/pull/*/head:refs/remotes/origin/pr/*
-            wipe-workspace: 'True'
-            name: origin
-            shallow-clone: true
-            credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
-            reference-repo: /var/lib/jenkins/.git-references/apm-agent-java.git
-            branches:
-              - $REFSPEC
-    triggers:
-      - timed: 'H H(1-4) * * 0'

From a855963664a71b380ae9cc6bae0fce72e12ce04e Mon Sep 17 00:00:00 2001
From: Felix Barnsteiner <felixbarny@users.noreply.github.com>
Date: Tue, 18 Jan 2022 13:57:40 +0100
Subject: [PATCH 08/10] Use test instead of verify

The test goal doesn't require a Docker setup.
Verify executes the Docker-based integration tests.
Executing those on Windows doesn't add more coverage
and complicates the worker configuration.
---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c0f08b0c7c..e85acf78b0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -321,11 +321,11 @@ pipeline {
             }
           }
         }
-        stage('Windows Verify') {
+        stage('Windows Test') {
           steps {
             withGithubNotify(context: 'Windows Verify', tab: 'tests') {
               dir("${BASE_DIR}"){
-                bat "mvnw verify"
+                bat "mvnw test"
               }
             }
           }

From 6321c1d72f4de45cec4721ab337fdb4641220409 Mon Sep 17 00:00:00 2001
From: Victor Martinez <victormartinezrubio@gmail.com>
Date: Thu, 20 Jan 2022 17:03:01 +0000
Subject: [PATCH 09/10] Update .ci/schedule-weekly.groovy

---
 .ci/schedule-weekly.groovy | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.ci/schedule-weekly.groovy b/.ci/schedule-weekly.groovy
index 8c194cf189..8840a4cbbb 100644
--- a/.ci/schedule-weekly.groovy
+++ b/.ci/schedule-weekly.groovy
@@ -35,11 +35,7 @@ pipeline {
       steps {
         build(job: 'apm-agent-java/apm-agent-java-mbp/master',
           parameters: [
-            booleanParam(name: 'windows_ci', value: true),
-            booleanParam(name: 'Run_As_Master_Branch', value: false),
-            booleanParam(name: 'smoketests_ci', value: false),
-            booleanParam(name: 'bench_ci', value: false),
-            booleanParam(name: 'test_ci', value: false)
+            booleanParam(name: 'windows_ci', value: true)
           ],
           propagate: false,
           wait: false

From f3742ea0888b6109d0eb6adc17d4c9a582a7df76 Mon Sep 17 00:00:00 2001
From: Sylvain Juge <sylvain.juge@elastic.co>
Date: Mon, 31 Jan 2022 14:31:18 +0100
Subject: [PATCH 10/10] fix whitespace

---
 Jenkinsfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8512f44c92..33347722f1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -73,7 +73,7 @@ pipeline {
         pipelineManager([ cancelPreviousRunningBuilds: [ when: 'PR' ] ])
         deleteDir()
         gitCheckout(basedir: "${BASE_DIR}", githubNotifyFirstTimeContributor: true, shallow: false,
-          reference: '/var/lib/jenkins/.git-references/apm-agent-java.git')
+                    reference: '/var/lib/jenkins/.git-references/apm-agent-java.git')
         stash allowEmpty: true, name: 'source', useDefaultExcludes: false
         script {
           dir("${BASE_DIR}"){
@@ -365,11 +365,11 @@ pipeline {
           }
           steps {
             build(job: env.ITS_PIPELINE, propagate: false, wait: false,
-              parameters: [string(name: 'INTEGRATION_TEST', value: 'Java'),
-                           string(name: 'BUILD_OPTS', value: "--java-agent-version ${env.GIT_BASE_COMMIT} --opbeans-java-agent-branch ${env.GIT_BASE_COMMIT}"),
-                           string(name: 'GITHUB_CHECK_NAME', value: env.GITHUB_CHECK_ITS_NAME),
-                           string(name: 'GITHUB_CHECK_REPO', value: env.REPO),
-                           string(name: 'GITHUB_CHECK_SHA1', value: env.GIT_BASE_COMMIT)])
+                  parameters: [string(name: 'INTEGRATION_TEST', value: 'Java'),
+                               string(name: 'BUILD_OPTS', value: "--java-agent-version ${env.GIT_BASE_COMMIT} --opbeans-java-agent-branch ${env.GIT_BASE_COMMIT}"),
+                               string(name: 'GITHUB_CHECK_NAME', value: env.GITHUB_CHECK_ITS_NAME),
+                               string(name: 'GITHUB_CHECK_REPO', value: env.REPO),
+                               string(name: 'GITHUB_CHECK_SHA1', value: env.GIT_BASE_COMMIT)])
             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('/','+')}")
           }
         }
@@ -464,8 +464,8 @@ pipeline {
                 deleteDir()
                 dir("${OPBEANS_REPO}"){
                   git(credentialsId: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba',
-                    url: "git@github.com:elastic/${OPBEANS_REPO}.git",
-                    branch: 'main')
+                      url: "git@github.com:elastic/${OPBEANS_REPO}.git",
+                      branch: 'main')
                   // It's required to transform the tag value to the artifact version
                   sh script: ".ci/bump-version.sh ${env.BRANCH_NAME.replaceAll('^v', '')}", label: 'Bump version'
                   // The opbeans-java pipeline will trigger a release for the main branch