From 4731b0088cb6a3e2532a6c9610185dd239ec260d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 19:07:10 -0400 Subject: [PATCH 1/3] [AUTO] Updated input manifests. (#2596) * Updated manifests. Signed-off-by: opensearch-ci-bot * Remove 2.2.2 from the check for build as 2.3.0 is about to release Signed-off-by: Peter Zhu * Add common-utils Signed-off-by: Peter Zhu Signed-off-by: opensearch-ci-bot Signed-off-by: Peter Zhu Co-authored-by: opensearch-ci-bot Co-authored-by: Peter Zhu --- jenkins/check-for-build.jenkinsfile | 2 ++ manifests/1.3.6/opensearch-1.3.6.yml | 16 ++++++++++++++++ manifests/2.2.2/opensearch-2.2.2.yml | 16 ++++++++++++++++ manifests/2.4.0/opensearch-2.4.0.yml | 24 ++++++++++++++++++++++++ 4 files changed, 58 insertions(+) create mode 100644 manifests/1.3.6/opensearch-1.3.6.yml create mode 100644 manifests/2.2.2/opensearch-2.2.2.yml create mode 100644 manifests/2.4.0/opensearch-2.4.0.yml diff --git a/jenkins/check-for-build.jenkinsfile b/jenkins/check-for-build.jenkinsfile index ec38b59d30..60d258062c 100644 --- a/jenkins/check-for-build.jenkinsfile +++ b/jenkins/check-for-build.jenkinsfile @@ -11,6 +11,8 @@ pipeline { } triggers { parameterizedCron ''' + H 1 * * * %INPUT_MANIFEST=2.4.0/opensearch-2.4.0.yml;TARGET_JOB_NAME=distribution-build-opensearch + H 1 * * * %INPUT_MANIFEST=1.3.6/opensearch-1.3.6.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 H 1 * * * %INPUT_MANIFEST=3.0.0/opensearch-dashboards-3.0.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards ''' diff --git a/manifests/1.3.6/opensearch-1.3.6.yml b/manifests/1.3.6/opensearch-1.3.6.yml new file mode 100644 index 0000000000..dc06946b97 --- /dev/null +++ b/manifests/1.3.6/opensearch-1.3.6.yml @@ -0,0 +1,16 @@ +--- +schema-version: '1.0' +build: + name: OpenSearch + version: 1.3.6 +ci: + image: + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 + args: -e JAVA_HOME=/opt/java/openjdk-11 +components: + - name: OpenSearch + repository: https://github.com/opensearch-project/OpenSearch.git + ref: '1.3' + checks: + - gradle:publish + - gradle:properties:version diff --git a/manifests/2.2.2/opensearch-2.2.2.yml b/manifests/2.2.2/opensearch-2.2.2.yml new file mode 100644 index 0000000000..33317492ee --- /dev/null +++ b/manifests/2.2.2/opensearch-2.2.2.yml @@ -0,0 +1,16 @@ +--- +schema-version: '1.0' +build: + name: OpenSearch + version: 2.2.2 +ci: + image: + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 + args: -e JAVA_HOME=/opt/java/openjdk-17 +components: + - name: OpenSearch + repository: https://github.com/opensearch-project/OpenSearch.git + ref: '2.2' + checks: + - gradle:publish + - gradle:properties:version diff --git a/manifests/2.4.0/opensearch-2.4.0.yml b/manifests/2.4.0/opensearch-2.4.0.yml new file mode 100644 index 0000000000..d147431bbe --- /dev/null +++ b/manifests/2.4.0/opensearch-2.4.0.yml @@ -0,0 +1,24 @@ +--- +schema-version: '1.0' +build: + name: OpenSearch + version: 2.4.0 +ci: + image: + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 + args: -e JAVA_HOME=/opt/java/openjdk-17 +components: + - name: OpenSearch + repository: https://github.com/opensearch-project/OpenSearch.git + ref: 2.x + checks: + - gradle:publish + - gradle:properties:version + - name: common-utils + repository: https://github.com/opensearch-project/common-utils.git + ref: 2.x + platforms: + - linux + checks: + - gradle:publish + - gradle:properties:version From ce6e8b39df31b8d458858882fa7047708f6fa437 Mon Sep 17 00:00:00 2001 From: Sayali Gaikawad <61760125+gaiksaya@users.noreply.github.com> Date: Fri, 9 Sep 2022 10:50:11 -0700 Subject: [PATCH 2/3] Fix param descriptions (#2598) Signed-off-by: Sayali Gaikawad Signed-off-by: Sayali Gaikawad --- jenkins/opensearch-dashboards/integ-test.jenkinsfile | 2 +- jenkins/opensearch/perf-test.jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile index d09c4461c0..90dd217edb 100644 --- a/jenkins/opensearch-dashboards/integ-test.jenkinsfile +++ b/jenkins/opensearch-dashboards/integ-test.jenkinsfile @@ -17,7 +17,7 @@ pipeline { ) string( name: 'BUILD_MANIFEST_URL', - description: 'The build manifest URL, e.g. https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.0.0/98/linux/x64/builds/opensearch-dashboards/manifest.yml.', + description: 'The build manifest URL, e.g. https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.0.0/98/linux/x64/tar/builds/opensearch-dashboards/manifest.yml', trim: true ) string( diff --git a/jenkins/opensearch/perf-test.jenkinsfile b/jenkins/opensearch/perf-test.jenkinsfile index b81a71304d..d507b07908 100644 --- a/jenkins/opensearch/perf-test.jenkinsfile +++ b/jenkins/opensearch/perf-test.jenkinsfile @@ -26,7 +26,7 @@ pipeline { parameters { string( name: 'BUNDLE_MANIFEST_URL', - description: 'The bundle manifest URL, e.g. https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.2.2/98/linux/x64/builds/opensearch/manifest.yml.', + description: 'The distribution manifest URL, e.g. https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.3.0/6039/linux/x64/tar/dist/opensearch/manifest.yml', trim: true ) string( From d502f4ad0546ccbca7df9246e9cd5f9ef7d11399 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Sep 2022 12:58:28 -0700 Subject: [PATCH 3/3] Updated manifests. (#2599) Signed-off-by: opensearch-ci-bot Signed-off-by: opensearch-ci-bot Co-authored-by: opensearch-ci-bot --- jenkins/check-for-build.jenkinsfile | 1 + manifests/2.4.0/opensearch-dashboards-2.4.0.yml | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 manifests/2.4.0/opensearch-dashboards-2.4.0.yml diff --git a/jenkins/check-for-build.jenkinsfile b/jenkins/check-for-build.jenkinsfile index 60d258062c..46a432d1b9 100644 --- a/jenkins/check-for-build.jenkinsfile +++ b/jenkins/check-for-build.jenkinsfile @@ -11,6 +11,7 @@ pipeline { } triggers { parameterizedCron ''' + H 1 * * * %INPUT_MANIFEST=2.4.0/opensearch-dashboards-2.4.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards H 1 * * * %INPUT_MANIFEST=2.4.0/opensearch-2.4.0.yml;TARGET_JOB_NAME=distribution-build-opensearch H 1 * * * %INPUT_MANIFEST=1.3.6/opensearch-1.3.6.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 diff --git a/manifests/2.4.0/opensearch-dashboards-2.4.0.yml b/manifests/2.4.0/opensearch-dashboards-2.4.0.yml new file mode 100644 index 0000000000..a7aff55968 --- /dev/null +++ b/manifests/2.4.0/opensearch-dashboards-2.4.0.yml @@ -0,0 +1,12 @@ +--- +schema-version: '1.0' +build: + name: OpenSearch Dashboards + version: 2.4.0 +ci: + image: + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2 +components: + - name: OpenSearch-Dashboards + repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git + ref: 2.x