Fix conflict

Signed-off-by: prudhvigodithi <[email protected]>

.github/workflows/increment-plugin-versions.yml

@@ -40,6 +40,7 @@ jobs:
           - {repo: sql}
         branch:
           - '2.2'
+          - '2.x'
           - '1.3'
         exclude:
           - {repo: geospatial, branch: '1.3'}

jenkins/check-for-build.jenkinsfile

@@ -11,8 +11,6 @@ pipeline {
     }
     triggers {
         parameterizedCron '''
-            H/60 * * * * %INPUT_MANIFEST=2.2.1/opensearch-2.2.1.yml;TEST_MANIFEST=2.2.1/opensearch-2.2.1-test.yml;TARGET_JOB_NAME=distribution-build-opensearch
-            H/60 * * * * %INPUT_MANIFEST=2.2.1/opensearch-dashboards-2.2.1.yml;TEST_MANIFEST=2.2.1/opensearch-dashboards-2.2.1-test.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards
             H 1 * * * %INPUT_MANIFEST=2.3.0/opensearch-dashboards-2.3.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards
             H 1 * * * %INPUT_MANIFEST=2.3.0/opensearch-2.3.0.yml;TARGET_JOB_NAME=distribution-build-opensearch
             H 1 * * * %INPUT_MANIFEST=3.0.0/opensearch-3.0.0.yml;TARGET_JOB_NAME=distribution-build-opensearch

jenkins/gradle/gradle-check.jenkinsfile

@@ -129,6 +129,9 @@ pipeline {
                 }
             }
             post() {
+                failure {
+                    archiveArtifacts artifacts: '**/build/heapdump/*.hprof', allowEmptyArchive: true
+                }
                 always {
                     sh ("cp -v `find search/build/reports/jacoco/ -name '*.xml' | head -n 1` codeCoverage.xml || echo")
                     junit allowEmptyResults: true, testResults: '**/build/test-results/**/*.xml'

tests/jenkins/LibFunctionTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import jenkins.tests.BuildPipelineTest
 
 abstract class LibFunctionTester extends BuildPipelineTest {

tests/jenkins/TestCopyContainer.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import jenkins.tests.BuildPipelineTest
 import org.junit.*
 

tests/jenkins/TestCreateGithubIssue.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 package jenkins.tests
 
 import jenkins.tests.BuildPipelineTest

tests/jenkins/TestPromoteContainer.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import jenkins.tests.BuildPipelineTest
 import org.junit.Before
 import org.junit.Test

tests/jenkins/TestSignStandaloneArtifactsJob.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import jenkins.tests.BuildPipelineTest
 import org.junit.Before
 import org.junit.Test

tests/jenkins/TestUploadTestResults.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import jenkins.tests.BuildPipelineTest
 import org.junit.Before
 import org.junit.Test

tests/jenkins/TestUploadToS3.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import jenkins.tests.BuildPipelineTest
 import org.junit.Before
 import org.junit.Test

tests/jenkins/lib-testers/AssembleManifestLibTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 

tests/jenkins/lib-testers/BuildFailureMessageLibTester.groovy

@@ -1,5 +1,10 @@
-import static org.hamcrest.CoreMatchers.notNullValue
-import static org.hamcrest.MatcherAssert.assertThat
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 
 class BuildFailureMessageLibTester extends LibFunctionTester {
 
@@ -22,4 +27,4 @@ class BuildFailureMessageLibTester extends LibFunctionTester {
 
     void configure(helper, binding){
     }
-}
+}

tests/jenkins/lib-testers/BuildInfoYamlLibTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 

tests/jenkins/lib-testers/BuildYumRepoTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 

tests/jenkins/lib-testers/CreateGithubIssueLibTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.CoreMatchers.nullValue
 import static org.hamcrest.MatcherAssert.assertThat

tests/jenkins/lib-testers/CreateReleaseTagLibTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import jenkins.BundleManifest
 import org.yaml.snakeyaml.Yaml
 

tests/jenkins/lib-testers/CreateTestResultsMessageLibTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 
@@ -20,7 +27,7 @@ class CreateTestResultsMessageLibTester extends LibFunctionTester {
 
     void configure(helper, binding) {
         binding.setVariable('STAGE_NAME', 'stage')
-        helper.registerAllowedMethod('findFiles', [Map.class], null)  
+        helper.registerAllowedMethod('findFiles', [Map.class], null)
     }
 
     void parameterInvariantsAssertions(call) {

tests/jenkins/lib-testers/DetectTestDockerAgentLibTester.groovy

@@ -1,5 +1,10 @@
-import static org.hamcrest.CoreMatchers.notNullValue
-import static org.hamcrest.MatcherAssert.assertThat
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import org.yaml.snakeyaml.Yaml
 
 

tests/jenkins/lib-testers/DownloadBuildManifestLibTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 import org.yaml.snakeyaml.Yaml

tests/jenkins/lib-testers/DownloadFromS3LibTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 import static org.hamcrest.CoreMatchers.anyOf

tests/jenkins/lib-testers/PrintArtifactDownloadUrlsForStagingLibTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.MatcherAssert.assertThat
 import static org.hamcrest.core.IsNull.notNullValue
 

tests/jenkins/lib-testers/PublishNotificationLibTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 

tests/jenkins/lib-testers/RpmDashboardsDistValidationLibTester.groovy

@@ -1,4 +1,11 @@
 
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 

tests/jenkins/lib-testers/RpmMetaValidationLibTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 

tests/jenkins/lib-testers/RpmOpenSearchDistValidationLibTester.groovy

@@ -1,4 +1,10 @@
-
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 

tests/jenkins/lib-testers/RunBwcTestScriptLibTest.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 

tests/jenkins/lib-testers/RunGradleCheckLibTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 

tests/jenkins/lib-testers/RunIntegTestScriptLibTest.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 

tests/jenkins/lib-testers/RunPerfTestScriptLibTest.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 
@@ -93,4 +100,4 @@ class RunPerfTestScriptLibTester extends LibFunctionTester {
     String libFunctionName() {
         return 'runPerfTestScript'
     }
-}
+}

tests/jenkins/lib-testers/ScanDockerImageLibTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 

tests/jenkins/lib-testers/SignArtifactsLibTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 

tests/jenkins/lib-testers/UploadIndexFileLibTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 

tests/jenkins/lib-testers/UploadMinSnapshotsToS3LibTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 

tests/jenkins/lib-testers/UploadTestResultsLibTester.groovy

@@ -1,3 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat