From 6987c9a4df746c6ba04ac367547769ff47465489 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 6 Dec 2021 16:46:12 -0500 Subject: [PATCH 01/20] Add 1.1.1 related templates and manifests Signed-off-by: Peter Zhu --- .../release-1.1.1-plugin-issues.md | 53 ++++++++++++++++ .../release-1.3.0-plugin-issues.md | 56 +++++++++++++++++ manifests/1.1.1/opensearch-1.1.1.yml | 50 ++++++++-------- .../1.1.1/opensearch-dashboards-1.1.1.yml | 60 +++++++++++++++++++ 4 files changed, 194 insertions(+), 25 deletions(-) create mode 100644 .github/meta_issue_template/release-1.1.1-plugin-issues.md create mode 100644 .github/meta_issue_template/release-1.3.0-plugin-issues.md create mode 100644 manifests/1.1.1/opensearch-dashboards-1.1.1.yml diff --git a/.github/meta_issue_template/release-1.1.1-plugin-issues.md b/.github/meta_issue_template/release-1.1.1-plugin-issues.md new file mode 100644 index 0000000000..62ae20b44c --- /dev/null +++ b/.github/meta_issue_template/release-1.1.1-plugin-issues.md @@ -0,0 +1,53 @@ +This is a component issue for release 1.1.1. +Coming from [release issue 1.1.1](https://github.com/opensearch-project/opensearch-build/issues/870), release version 1.1.1. Please follow the following checklist. + +
How to use this component issue +

+ +## This Component Issue +This component issue captures the state of the OpenSearch release, on component/plugin level, its assignee is responsible for driving the release of the component. Please contact them or @mention them on this issue for help. + +## Release Steps +There are several steps to the release process, components that are behind present risk to the release. Component owners resolve tasks on this ticket to communicate with the overall release owner. + +Steps have completion dates for coordinating efforts between the components of a release; components can start as soon as they are ready far in advance of a future release. + +You can find all the corresponding dates of each step in the release issue above. + +

+
+ + +### You can find all the date in above issue +### (We only make changes to OpenSearch-Dashboards to 1.1.1, therefore, OpenSearch stays 1.1.1.) + +### Preparation + +- [ ] Assign this issue to a release owner. +- [ ] All the tasks in this issue have been reviewed by the release owner. +- [ ] Create, update, triage and label all features and issues targeted for this release with v1.1.1. + +### CI/CD + +- [ ] If including changes in this release, increment plugin version on 1.1 branch to `1.1.1.0`, otherwise stay on `1.1.1.0`. +- [ ] All code changes for 1.1.1 are complete. +- [ ] Ensure working and passing CI. + +### Pre-Release + +- [ ] Merge any changes to 1.1 you need for the patch +- [ ] Complete integration and sanity tests, and update results in the comment, contact corresponding assigner in meta issue above if needed. +- [ ] Fix bugs that you find during the integration test, wait for a new build and test again. +- [ ] All intermittent test failures have issues filed + +### Release + +- [ ] Complete [documentation](https://github.com/opensearch-project/documentation-website). +- [ ] Gather, review and publish release notes. +- [ ] Verify all issued labeled for this release are closed or labelled for the next release. + +### Post Release + +- [ ] Create [a release tag](https://github.com/opensearch-project/.github/blob/main/RELEASING.md#tagging). +- [ ] Suggest improvements to [this template](https://github.com/opensearch-project/opensearch-build/blob/main/.github/ISSUE_TEMPLATE/release_template.md). +- [ ] Conduct a postmortem, and publish its results. diff --git a/.github/meta_issue_template/release-1.3.0-plugin-issues.md b/.github/meta_issue_template/release-1.3.0-plugin-issues.md new file mode 100644 index 0000000000..be601f311f --- /dev/null +++ b/.github/meta_issue_template/release-1.3.0-plugin-issues.md @@ -0,0 +1,56 @@ +This is a component issue for release 1.3.0. +Coming from [release issue 1.3.0](https://github.com/opensearch-project/opensearch-build/issues/870), release version 1.3.0. Please follow the following checklist. + +
How to use this component issue +

+ +## This Component Issue +This component issue captures the state of the OpenSearch release, on component/plugin level, its assignee is responsible for driving the release of the component. Please contact them or @mention them on this issue for help. + +## Release Steps +There are several steps to the release process, components that are behind present risk to the release. Component owners resolve tasks on this ticket to communicate with the overall release owner. + +Steps have completion dates for coordinating efforts between the components of a release; components can start as soon as they are ready far in advance of a future release. + +You can find all the corresponding dates of each step in the release issue above. + +

+
+ + +### You can find all the date in above issue +### (We only make changes to OpenSearch-Dashboards to 1.3.0, therefore, OpenSearch stays 1.3.0.) + +### Preparation + +- [ ] Assign this issue to a release owner. +- [ ] Finalize scope and feature set and update [the Public Roadmap](https://github.com/orgs/opensearch-project/projects/1). +- [ ] All the tasks in this issue have been reviewed by the release owner. +- [ ] Create, update, triage and label all features and issues targeted for this release with v1.3.0. + +### CI/CD + +- [ ] If including changes in this release, increment plugin version on 1.3 branch to `1.3.0.0`, otherwise stay on `1.3.0.0`. +- [ ] All code changes for 1.3.0 are complete. +- [ ] Ensure working and passing CI. +- [ ] Re(add) this repo to the (if not exist) [opensearch-dashboards input manifest](https://github.com/opensearch-project/opensearch-build/blob/main/manifests/1.3.0/opensearch-dashboards-1.3.0.yml). + +### Pre-Release + +- [ ] Update your branch in the [opensearch-dashboards input manifest](https://github.com/opensearch-project/opensearch-build/blob/main/manifests/1.3.0/opensearch-dashboards-1.3.0.yml). +- [ ] Merge any changes to 1.3 you need for the patch +- [ ] Complete integration tests, and update results in the comment, contact corresponding assigner in meta issue above if needed. +- [ ] Fix bugs that you find during the integration test, wait for a new build and test again. +- [ ] All intermittent test failures have issues filed + +### Release + +- [ ] Complete [documentation](https://github.com/opensearch-project/documentation-website). +- [ ] Gather, review and publish release notes. +- [ ] Verify all issued labeled for this release are closed or labelled for the next release. + +### Post Release + +- [ ] Create [a release tag](https://github.com/opensearch-project/.github/blob/main/RELEASING.md#tagging). +- [ ] Suggest improvements to [this template](https://github.com/opensearch-project/opensearch-build/blob/main/.github/ISSUE_TEMPLATE/release_template.md). +- [ ] Conduct a postmortem, and publish its results. diff --git a/manifests/1.1.1/opensearch-1.1.1.yml b/manifests/1.1.1/opensearch-1.1.1.yml index 33e6b5300e..2137df283f 100644 --- a/manifests/1.1.1/opensearch-1.1.1.yml +++ b/manifests/1.1.1/opensearch-1.1.1.yml @@ -1,73 +1,73 @@ --- schema-version: "1.0" +ci: + image: + name: "opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028" build: name: OpenSearch version: 1.1.1 patches: - 1.1.0 components: - - name: OpenSearch - repository: https://github.com/opensearch-project/OpenSearch.git + - name: dashboards-reports + repository: https://github.com/opensearch-project/dashboards-reports.git + working_directory: reports-scheduler ref: "1.1" + platforms: + - linux + checks: + - manifest:component + - name: OpenSearch + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - - gradle:publish - - gradle:properties:version + - manifest:component - name: common-utils - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: job-scheduler - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: sql - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: alerting - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: security - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: cross-cluster-replication - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 - checks: - - manifest:component - - name: performance-analyzer-rca - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: performance-analyzer - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: index-management - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: k-NN - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component platforms: - - darwin - linux - name: anomaly-detection - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: asynchronous-search - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 - checks: - - manifest:component - - name: dashboards-reports - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: dashboards-notebooks - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component diff --git a/manifests/1.1.1/opensearch-dashboards-1.1.1.yml b/manifests/1.1.1/opensearch-dashboards-1.1.1.yml new file mode 100644 index 0000000000..6928a55b50 --- /dev/null +++ b/manifests/1.1.1/opensearch-dashboards-1.1.1.yml @@ -0,0 +1,60 @@ +--- +schema-version: "1.0" +ci: + image: + name: "opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028" +build: + name: OpenSearch Dashboards + version: 1.1.1 + patches: + - 1.1.0 +components: + - name: reportsDashboards + repository: https://github.com/opensearch-project/dashboards-reports + ref: "1.1" + working_directory: "dashboards-reports" + platforms: + - linux + checks: + - manifest:component + - name: OpenSearch-Dashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component + - name: alertingDashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component + - name: securityDashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component + - name: indexManagementDashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component + - name: queryWorkbenchDashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component + - name: notebooksDashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component + - name: ganttChartDashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component + - name: traceAnalyticsDashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component + - name: anomalyDetectionDashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component +# - name: functionalTestDashboards +# repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git +# ref: "main" +# checks: +# - manifest:component From f2da32e4d86f7b8f928c73a9fc37e7fcacbeeb75 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 7 Dec 2021 16:59:54 -0500 Subject: [PATCH 02/20] More changes to template and bundle code to make build 1.1.1 opensearch runs Signed-off-by: Peter Zhu --- .../release-1.1.1-plugin-issues-min.md | 53 +++++++++++++++++++ .../release-1.1.1-plugin-issues.md | 4 +- .../release-1.3.0-plugin-issues.md | 1 - manifests/1.1.1/opensearch-1.1.1.yml | 16 +++--- src/build_workflow/builder_from_source.py | 3 +- 5 files changed, 65 insertions(+), 12 deletions(-) create mode 100644 .github/meta_issue_template/release-1.1.1-plugin-issues-min.md diff --git a/.github/meta_issue_template/release-1.1.1-plugin-issues-min.md b/.github/meta_issue_template/release-1.1.1-plugin-issues-min.md new file mode 100644 index 0000000000..06959d869a --- /dev/null +++ b/.github/meta_issue_template/release-1.1.1-plugin-issues-min.md @@ -0,0 +1,53 @@ +This is a component issue for release 1.1.1. +Coming from [release issue 1.1.1](https://github.com/opensearch-project/opensearch-build/issues/870), release version 1.1.1. Please follow the following checklist. + +
How to use this component issue +

+ +## This Component Issue +This component issue captures the state of the OpenSearch release, on component/plugin level, its assignee is responsible for driving the release of the component. Please contact them or @mention them on this issue for help. + +## Release Steps +There are several steps to the release process, components that are behind present risk to the release. Component owners resolve tasks on this ticket to communicate with the overall release owner. + +Steps have completion dates for coordinating efforts between the components of a release; components can start as soon as they are ready far in advance of a future release. + +You can find all the corresponding dates of each step in the release issue above. + +

+
+ + +### You can find all the date in above issue +### (We make changes to both OpenSearch and OpenSearch-Dashboards for 1.1.1) + +### Preparation + +- [ ] Assign this issue to a release owner. +- [ ] All the tasks in this issue have been reviewed by the release owner. +- [ ] Create, update, triage and label all features and issues targeted for this release with v1.1.1. + +### CI/CD + +- [ ] If including changes in this release, increment plugin version on 1.1 branch to `1.1.1`, otherwise stay on `1.1.0`. +- [ ] All code changes for 1.1.1 are complete. +- [ ] Ensure working and passing CI. + +### Pre-Release + +- [ ] Merge any changes to 1.1 you need for the patch +- [ ] Complete integration and sanity tests, and update results in the comment, contact corresponding assigner in meta issue above if needed. +- [ ] Fix bugs that you find during the integration test, wait for a new build and test again. +- [ ] All intermittent test failures have issues filed + +### Release + +- [ ] Complete [documentation](https://github.com/opensearch-project/documentation-website). +- [ ] Gather, review and publish release notes. +- [ ] Verify all issued labeled for this release are closed or labelled for the next release. + +### Post Release + +- [ ] Create [a release tag](https://github.com/opensearch-project/.github/blob/main/RELEASING.md#tagging). +- [ ] Suggest improvements to [this template](https://github.com/opensearch-project/opensearch-build/blob/main/.github/ISSUE_TEMPLATE/release_template.md). +- [ ] Conduct a postmortem, and publish its results. diff --git a/.github/meta_issue_template/release-1.1.1-plugin-issues.md b/.github/meta_issue_template/release-1.1.1-plugin-issues.md index 62ae20b44c..ebfaa64794 100644 --- a/.github/meta_issue_template/release-1.1.1-plugin-issues.md +++ b/.github/meta_issue_template/release-1.1.1-plugin-issues.md @@ -19,7 +19,7 @@ You can find all the corresponding dates of each step in the release issue above ### You can find all the date in above issue -### (We only make changes to OpenSearch-Dashboards to 1.1.1, therefore, OpenSearch stays 1.1.1.) +### (We make changes to both OpenSearch and OpenSearch-Dashboards for 1.1.1) ### Preparation @@ -29,7 +29,7 @@ You can find all the corresponding dates of each step in the release issue above ### CI/CD -- [ ] If including changes in this release, increment plugin version on 1.1 branch to `1.1.1.0`, otherwise stay on `1.1.1.0`. +- [ ] If including changes in this release, increment plugin version on 1.1 branch to `1.1.1.0`, otherwise stay on `1.1.0.0`. - [ ] All code changes for 1.1.1 are complete. - [ ] Ensure working and passing CI. diff --git a/.github/meta_issue_template/release-1.3.0-plugin-issues.md b/.github/meta_issue_template/release-1.3.0-plugin-issues.md index be601f311f..1dc5ee8a79 100644 --- a/.github/meta_issue_template/release-1.3.0-plugin-issues.md +++ b/.github/meta_issue_template/release-1.3.0-plugin-issues.md @@ -19,7 +19,6 @@ You can find all the corresponding dates of each step in the release issue above ### You can find all the date in above issue -### (We only make changes to OpenSearch-Dashboards to 1.3.0, therefore, OpenSearch stays 1.3.0.) ### Preparation diff --git a/manifests/1.1.1/opensearch-1.1.1.yml b/manifests/1.1.1/opensearch-1.1.1.yml index 2137df283f..f418179de1 100644 --- a/manifests/1.1.1/opensearch-1.1.1.yml +++ b/manifests/1.1.1/opensearch-1.1.1.yml @@ -9,14 +9,6 @@ build: patches: - 1.1.0 components: - - name: dashboards-reports - repository: https://github.com/opensearch-project/dashboards-reports.git - working_directory: reports-scheduler - ref: "1.1" - platforms: - - linux - checks: - - manifest:component - name: OpenSearch dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: @@ -29,6 +21,14 @@ components: dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component + - name: dashboards-reports + repository: https://github.com/opensearch-project/dashboards-reports.git + working_directory: reports-scheduler + ref: "1.1" + platforms: + - linux + checks: + - manifest:component - name: sql dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: diff --git a/src/build_workflow/builder_from_source.py b/src/build_workflow/builder_from_source.py index ce4f700a5e..be1941154e 100644 --- a/src/build_workflow/builder_from_source.py +++ b/src/build_workflow/builder_from_source.py @@ -34,7 +34,8 @@ def build(self, build_recorder): "bash", build_script, "-v", - self.target.version, + #self.target.version, + self.target.patches[0], "-p", self.target.platform, "-a", From d3ac3fa887995a06e18e97e29692f6e555a5e7ae Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 7 Dec 2021 19:25:27 -0500 Subject: [PATCH 03/20] Add more changes Signed-off-by: Peter Zhu --- jenkins/opensearch/Jenkinsfile | 156 ++++++++++++++++----------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/jenkins/opensearch/Jenkinsfile b/jenkins/opensearch/Jenkinsfile index d466a7cb5d..5abe5630d0 100644 --- a/jenkins/opensearch/Jenkinsfile +++ b/jenkins/opensearch/Jenkinsfile @@ -2,12 +2,12 @@ lib = library(identifier: "jenkins@20211123", retriever: legacySCM(scm)) pipeline { agent none - triggers { - parameterizedCron ''' - H */2 * * * %INPUT_MANIFEST=1.3.0/opensearch-1.3.0.yml - H 1 * * * %INPUT_MANIFEST=2.0.0/opensearch-2.0.0.yml - ''' - } + //triggers { + // parameterizedCron ''' + // H */2 * * * %INPUT_MANIFEST=1.3.0/opensearch-1.3.0.yml + // H 1 * * * %INPUT_MANIFEST=2.0.0/opensearch-2.0.0.yml + // ''' + //} parameters { string( name: 'INPUT_MANIFEST', @@ -32,35 +32,35 @@ pipeline { } stage('build') { parallel { - stage('build-snapshot') { - environment { - SNAPSHOT_REPO_URL = "https://aws.oss.sonatype.org/content/repositories/snapshots/" - } - agent { - docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' - image dockerAgent.image - args dockerAgent.args - alwaysPull true - } - } - steps { - script { - git url: 'https://github.com/opensearch-project/opensearch-build.git', branch: 'main' - buildManifest( - snapshot: true - ) - withCredentials([usernamePassword(credentialsId: 'Sonatype', usernameVariable: 'SONATYPE_USERNAME', passwordVariable: 'SONATYPE_PASSWORD')]) { - sh('$WORKSPACE/publish/publish-snapshot.sh $WORKSPACE/builds/opensearch/maven') - } - } - } - post { - always { - postCleanup() - } - } - } + //stage('build-snapshot') { + // environment { + // SNAPSHOT_REPO_URL = "https://aws.oss.sonatype.org/content/repositories/snapshots/" + // } + // agent { + // docker { + // label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + // image dockerAgent.image + // args dockerAgent.args + // alwaysPull true + // } + // } + // steps { + // script { + // git url: 'https://github.com/opensearch-project/opensearch-build.git', branch: 'main' + // buildManifest( + // snapshot: true + // ) + // withCredentials([usernamePassword(credentialsId: 'Sonatype', usernameVariable: 'SONATYPE_USERNAME', passwordVariable: 'SONATYPE_PASSWORD')]) { + // sh('$WORKSPACE/publish/publish-snapshot.sh $WORKSPACE/builds/opensearch/maven') + // } + // } + // } + // post { + // always { + // postCleanup() + // } + // } + //} stage('build-x64') { agent { docker { @@ -81,51 +81,51 @@ pipeline { } } } - stage('build-arm64') { - agent { - docker { - label 'Jenkins-Agent-al2-arm64-c6g4xlarge-Docker-Host' - image dockerAgent.image - args dockerAgent.args - alwaysPull true - } - } - steps { - script { - buildAssembleUpload() - } - } - post { - always { - postCleanup() - } - } - } - } - } - stage('docker build') { - steps { - node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { - script { - buildDockerImage() - } - } + //stage('build-arm64') { + // agent { + // docker { + // label 'Jenkins-Agent-al2-arm64-c6g4xlarge-Docker-Host' + // image dockerAgent.image + // args dockerAgent.args + // alwaysPull true + // } + // } + // steps { + // script { + // buildAssembleUpload() + // } + // } + // post { + // always { + // postCleanup() + // } + // } + //} } } + //stage('docker build') { + // steps { + // node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { + // script { + // buildDockerImage() + // } + // } + // } + //} } post { success { node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { script { - def stashed = lib.jenkins.Messages.new(this).get(['build-x64', 'build-arm64']) + //def stashed = lib.jenkins.Messages.new(this).get(['build-x64', 'build-arm64']) - publishNotification( - icon: ':white_check_mark:', - message: 'Successful Build', - extra: stashed, - credentialsId: 'BUILD_NOTICE_WEBHOOK', - manifest: "${INPUT_MANIFEST}" - ) + //publishNotification( + // icon: ':white_check_mark:', + // message: 'Successful Build', + // extra: stashed, + // credentialsId: 'BUILD_NOTICE_WEBHOOK', + // manifest: "${INPUT_MANIFEST}" + //) postCleanup() } @@ -134,12 +134,12 @@ pipeline { failure { node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { script { - publishNotification( - icon: ':warning:', - message: 'Failed Build', - credentialsId: 'BUILD_NOTICE_WEBHOOK', - manifest: "${INPUT_MANIFEST}" - ) + //publishNotification( + // icon: ':warning:', + // message: 'Failed Build', + // credentialsId: 'BUILD_NOTICE_WEBHOOK', + // manifest: "${INPUT_MANIFEST}" + //) postCleanup() } From 49e49a5aefcce957a701aae7c677ab338fff6c5f Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 7 Dec 2021 19:40:48 -0500 Subject: [PATCH 04/20] Add arm64 and docker build code Signed-off-by: Peter Zhu --- jenkins/opensearch/Jenkinsfile | 58 +++++++++++++++++----------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/jenkins/opensearch/Jenkinsfile b/jenkins/opensearch/Jenkinsfile index 5abe5630d0..d0ccafe6e7 100644 --- a/jenkins/opensearch/Jenkinsfile +++ b/jenkins/opensearch/Jenkinsfile @@ -81,37 +81,37 @@ pipeline { } } } - //stage('build-arm64') { - // agent { - // docker { - // label 'Jenkins-Agent-al2-arm64-c6g4xlarge-Docker-Host' - // image dockerAgent.image - // args dockerAgent.args - // alwaysPull true - // } - // } - // steps { - // script { - // buildAssembleUpload() - // } - // } - // post { - // always { - // postCleanup() - // } - // } - //} + stage('build-arm64') { + agent { + docker { + label 'Jenkins-Agent-al2-arm64-c6g4xlarge-Docker-Host' + image dockerAgent.image + args dockerAgent.args + alwaysPull true + } + } + steps { + script { + buildAssembleUpload() + } + } + post { + always { + postCleanup() + } + } + } + } + } + stage('docker build') { + steps { + node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { + script { + buildDockerImage() + } + } } } - //stage('docker build') { - // steps { - // node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { - // script { - // buildDockerImage() - // } - // } - // } - //} } post { success { From a169e38ef34cace44d355ac1579bdd010cab9bb6 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 8 Dec 2021 14:49:49 -0500 Subject: [PATCH 05/20] Restore Jenkinsfile Signed-off-by: Peter Zhu --- jenkins/opensearch/Jenkinsfile | 99 +++++++++++++++++----------------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/jenkins/opensearch/Jenkinsfile b/jenkins/opensearch/Jenkinsfile index d0ccafe6e7..cececeb162 100644 --- a/jenkins/opensearch/Jenkinsfile +++ b/jenkins/opensearch/Jenkinsfile @@ -2,12 +2,12 @@ lib = library(identifier: "jenkins@20211123", retriever: legacySCM(scm)) pipeline { agent none - //triggers { - // parameterizedCron ''' - // H */2 * * * %INPUT_MANIFEST=1.3.0/opensearch-1.3.0.yml - // H 1 * * * %INPUT_MANIFEST=2.0.0/opensearch-2.0.0.yml - // ''' - //} + triggers { + parameterizedCron ''' + H */2 * * * %INPUT_MANIFEST=1.3.0/opensearch-1.3.0.yml + H 1 * * * %INPUT_MANIFEST=2.0.0/opensearch-2.0.0.yml + ''' + } parameters { string( name: 'INPUT_MANIFEST', @@ -32,35 +32,35 @@ pipeline { } stage('build') { parallel { - //stage('build-snapshot') { - // environment { - // SNAPSHOT_REPO_URL = "https://aws.oss.sonatype.org/content/repositories/snapshots/" - // } - // agent { - // docker { - // label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' - // image dockerAgent.image - // args dockerAgent.args - // alwaysPull true - // } - // } - // steps { - // script { - // git url: 'https://github.com/opensearch-project/opensearch-build.git', branch: 'main' - // buildManifest( - // snapshot: true - // ) - // withCredentials([usernamePassword(credentialsId: 'Sonatype', usernameVariable: 'SONATYPE_USERNAME', passwordVariable: 'SONATYPE_PASSWORD')]) { - // sh('$WORKSPACE/publish/publish-snapshot.sh $WORKSPACE/builds/opensearch/maven') - // } - // } - // } - // post { - // always { - // postCleanup() - // } - // } - //} + stage('build-snapshot') { + environment { + SNAPSHOT_REPO_URL = "https://aws.oss.sonatype.org/content/repositories/snapshots/" + } + agent { + docker { + label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + image dockerAgent.image + args dockerAgent.args + alwaysPull true + } + } + steps { + script { + git url: 'https://github.com/opensearch-project/opensearch-build.git', branch: 'main' + buildManifest( + snapshot: true + ) + withCredentials([usernamePassword(credentialsId: 'Sonatype', usernameVariable: 'SONATYPE_USERNAME', passwordVariable: 'SONATYPE_PASSWORD')]) { + sh('$WORKSPACE/publish/publish-snapshot.sh $WORKSPACE/builds/opensearch/maven') + } + } + } + post { + always { + postCleanup() + } + } + } stage('build-x64') { agent { docker { @@ -117,15 +117,15 @@ pipeline { success { node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { script { - //def stashed = lib.jenkins.Messages.new(this).get(['build-x64', 'build-arm64']) + def stashed = lib.jenkins.Messages.new(this).get(['build-x64', 'build-arm64']) - //publishNotification( - // icon: ':white_check_mark:', - // message: 'Successful Build', - // extra: stashed, - // credentialsId: 'BUILD_NOTICE_WEBHOOK', - // manifest: "${INPUT_MANIFEST}" - //) + publishNotification( + icon: ':white_check_mark:', + message: 'Successful Build', + extra: stashed, + credentialsId: 'BUILD_NOTICE_WEBHOOK', + manifest: "${INPUT_MANIFEST}" + ) postCleanup() } @@ -134,12 +134,12 @@ pipeline { failure { node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { script { - //publishNotification( - // icon: ':warning:', - // message: 'Failed Build', - // credentialsId: 'BUILD_NOTICE_WEBHOOK', - // manifest: "${INPUT_MANIFEST}" - //) + publishNotification( + icon: ':warning:', + message: 'Failed Build', + credentialsId: 'BUILD_NOTICE_WEBHOOK', + manifest: "${INPUT_MANIFEST}" + ) postCleanup() } @@ -147,3 +147,4 @@ pipeline { } } } + From d80baf9d90e89276a2d054b3369d210a376b330a Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 8 Dec 2021 14:51:18 -0500 Subject: [PATCH 06/20] Restore Jenkinsfile Signed-off-by: Peter Zhu --- jenkins/opensearch/Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/jenkins/opensearch/Jenkinsfile b/jenkins/opensearch/Jenkinsfile index cececeb162..d466a7cb5d 100644 --- a/jenkins/opensearch/Jenkinsfile +++ b/jenkins/opensearch/Jenkinsfile @@ -147,4 +147,3 @@ pipeline { } } } - From 450c964c2598ed9c390084bd1ab87200288fe7c3 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 8 Dec 2021 14:52:39 -0500 Subject: [PATCH 07/20] Restore build from source python code Signed-off-by: Peter Zhu --- src/build_workflow/builder_from_source.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/build_workflow/builder_from_source.py b/src/build_workflow/builder_from_source.py index be1941154e..ce4f700a5e 100644 --- a/src/build_workflow/builder_from_source.py +++ b/src/build_workflow/builder_from_source.py @@ -34,8 +34,7 @@ def build(self, build_recorder): "bash", build_script, "-v", - #self.target.version, - self.target.patches[0], + self.target.version, "-p", self.target.platform, "-a", From 5220b27e50b3a80dff86d7695d0eb8e9053b377e Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 6 Dec 2021 16:46:12 -0500 Subject: [PATCH 08/20] Add 1.1.1 related templates and manifests Signed-off-by: Peter Zhu --- .../release-1.1.1-plugin-issues.md | 53 ++++++++++++++++ .../release-1.3.0-plugin-issues.md | 56 +++++++++++++++++ manifests/1.1.1/opensearch-1.1.1.yml | 50 ++++++++-------- .../1.1.1/opensearch-dashboards-1.1.1.yml | 60 +++++++++++++++++++ 4 files changed, 194 insertions(+), 25 deletions(-) create mode 100644 .github/meta_issue_template/release-1.1.1-plugin-issues.md create mode 100644 .github/meta_issue_template/release-1.3.0-plugin-issues.md create mode 100644 manifests/1.1.1/opensearch-dashboards-1.1.1.yml diff --git a/.github/meta_issue_template/release-1.1.1-plugin-issues.md b/.github/meta_issue_template/release-1.1.1-plugin-issues.md new file mode 100644 index 0000000000..62ae20b44c --- /dev/null +++ b/.github/meta_issue_template/release-1.1.1-plugin-issues.md @@ -0,0 +1,53 @@ +This is a component issue for release 1.1.1. +Coming from [release issue 1.1.1](https://github.com/opensearch-project/opensearch-build/issues/870), release version 1.1.1. Please follow the following checklist. + +
How to use this component issue +

+ +## This Component Issue +This component issue captures the state of the OpenSearch release, on component/plugin level, its assignee is responsible for driving the release of the component. Please contact them or @mention them on this issue for help. + +## Release Steps +There are several steps to the release process, components that are behind present risk to the release. Component owners resolve tasks on this ticket to communicate with the overall release owner. + +Steps have completion dates for coordinating efforts between the components of a release; components can start as soon as they are ready far in advance of a future release. + +You can find all the corresponding dates of each step in the release issue above. + +

+
+ + +### You can find all the date in above issue +### (We only make changes to OpenSearch-Dashboards to 1.1.1, therefore, OpenSearch stays 1.1.1.) + +### Preparation + +- [ ] Assign this issue to a release owner. +- [ ] All the tasks in this issue have been reviewed by the release owner. +- [ ] Create, update, triage and label all features and issues targeted for this release with v1.1.1. + +### CI/CD + +- [ ] If including changes in this release, increment plugin version on 1.1 branch to `1.1.1.0`, otherwise stay on `1.1.1.0`. +- [ ] All code changes for 1.1.1 are complete. +- [ ] Ensure working and passing CI. + +### Pre-Release + +- [ ] Merge any changes to 1.1 you need for the patch +- [ ] Complete integration and sanity tests, and update results in the comment, contact corresponding assigner in meta issue above if needed. +- [ ] Fix bugs that you find during the integration test, wait for a new build and test again. +- [ ] All intermittent test failures have issues filed + +### Release + +- [ ] Complete [documentation](https://github.com/opensearch-project/documentation-website). +- [ ] Gather, review and publish release notes. +- [ ] Verify all issued labeled for this release are closed or labelled for the next release. + +### Post Release + +- [ ] Create [a release tag](https://github.com/opensearch-project/.github/blob/main/RELEASING.md#tagging). +- [ ] Suggest improvements to [this template](https://github.com/opensearch-project/opensearch-build/blob/main/.github/ISSUE_TEMPLATE/release_template.md). +- [ ] Conduct a postmortem, and publish its results. diff --git a/.github/meta_issue_template/release-1.3.0-plugin-issues.md b/.github/meta_issue_template/release-1.3.0-plugin-issues.md new file mode 100644 index 0000000000..be601f311f --- /dev/null +++ b/.github/meta_issue_template/release-1.3.0-plugin-issues.md @@ -0,0 +1,56 @@ +This is a component issue for release 1.3.0. +Coming from [release issue 1.3.0](https://github.com/opensearch-project/opensearch-build/issues/870), release version 1.3.0. Please follow the following checklist. + +
How to use this component issue +

+ +## This Component Issue +This component issue captures the state of the OpenSearch release, on component/plugin level, its assignee is responsible for driving the release of the component. Please contact them or @mention them on this issue for help. + +## Release Steps +There are several steps to the release process, components that are behind present risk to the release. Component owners resolve tasks on this ticket to communicate with the overall release owner. + +Steps have completion dates for coordinating efforts between the components of a release; components can start as soon as they are ready far in advance of a future release. + +You can find all the corresponding dates of each step in the release issue above. + +

+
+ + +### You can find all the date in above issue +### (We only make changes to OpenSearch-Dashboards to 1.3.0, therefore, OpenSearch stays 1.3.0.) + +### Preparation + +- [ ] Assign this issue to a release owner. +- [ ] Finalize scope and feature set and update [the Public Roadmap](https://github.com/orgs/opensearch-project/projects/1). +- [ ] All the tasks in this issue have been reviewed by the release owner. +- [ ] Create, update, triage and label all features and issues targeted for this release with v1.3.0. + +### CI/CD + +- [ ] If including changes in this release, increment plugin version on 1.3 branch to `1.3.0.0`, otherwise stay on `1.3.0.0`. +- [ ] All code changes for 1.3.0 are complete. +- [ ] Ensure working and passing CI. +- [ ] Re(add) this repo to the (if not exist) [opensearch-dashboards input manifest](https://github.com/opensearch-project/opensearch-build/blob/main/manifests/1.3.0/opensearch-dashboards-1.3.0.yml). + +### Pre-Release + +- [ ] Update your branch in the [opensearch-dashboards input manifest](https://github.com/opensearch-project/opensearch-build/blob/main/manifests/1.3.0/opensearch-dashboards-1.3.0.yml). +- [ ] Merge any changes to 1.3 you need for the patch +- [ ] Complete integration tests, and update results in the comment, contact corresponding assigner in meta issue above if needed. +- [ ] Fix bugs that you find during the integration test, wait for a new build and test again. +- [ ] All intermittent test failures have issues filed + +### Release + +- [ ] Complete [documentation](https://github.com/opensearch-project/documentation-website). +- [ ] Gather, review and publish release notes. +- [ ] Verify all issued labeled for this release are closed or labelled for the next release. + +### Post Release + +- [ ] Create [a release tag](https://github.com/opensearch-project/.github/blob/main/RELEASING.md#tagging). +- [ ] Suggest improvements to [this template](https://github.com/opensearch-project/opensearch-build/blob/main/.github/ISSUE_TEMPLATE/release_template.md). +- [ ] Conduct a postmortem, and publish its results. diff --git a/manifests/1.1.1/opensearch-1.1.1.yml b/manifests/1.1.1/opensearch-1.1.1.yml index 33e6b5300e..2137df283f 100644 --- a/manifests/1.1.1/opensearch-1.1.1.yml +++ b/manifests/1.1.1/opensearch-1.1.1.yml @@ -1,73 +1,73 @@ --- schema-version: "1.0" +ci: + image: + name: "opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028" build: name: OpenSearch version: 1.1.1 patches: - 1.1.0 components: - - name: OpenSearch - repository: https://github.com/opensearch-project/OpenSearch.git + - name: dashboards-reports + repository: https://github.com/opensearch-project/dashboards-reports.git + working_directory: reports-scheduler ref: "1.1" + platforms: + - linux + checks: + - manifest:component + - name: OpenSearch + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - - gradle:publish - - gradle:properties:version + - manifest:component - name: common-utils - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: job-scheduler - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: sql - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: alerting - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: security - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: cross-cluster-replication - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 - checks: - - manifest:component - - name: performance-analyzer-rca - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: performance-analyzer - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: index-management - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: k-NN - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component platforms: - - darwin - linux - name: anomaly-detection - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: asynchronous-search - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 - checks: - - manifest:component - - name: dashboards-reports - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component - name: dashboards-notebooks - dist: https://ci.opensearch.org/ci/dbc/builds/1.1.0/405 + dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component diff --git a/manifests/1.1.1/opensearch-dashboards-1.1.1.yml b/manifests/1.1.1/opensearch-dashboards-1.1.1.yml new file mode 100644 index 0000000000..6928a55b50 --- /dev/null +++ b/manifests/1.1.1/opensearch-dashboards-1.1.1.yml @@ -0,0 +1,60 @@ +--- +schema-version: "1.0" +ci: + image: + name: "opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028" +build: + name: OpenSearch Dashboards + version: 1.1.1 + patches: + - 1.1.0 +components: + - name: reportsDashboards + repository: https://github.com/opensearch-project/dashboards-reports + ref: "1.1" + working_directory: "dashboards-reports" + platforms: + - linux + checks: + - manifest:component + - name: OpenSearch-Dashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component + - name: alertingDashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component + - name: securityDashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component + - name: indexManagementDashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component + - name: queryWorkbenchDashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component + - name: notebooksDashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component + - name: ganttChartDashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component + - name: traceAnalyticsDashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component + - name: anomalyDetectionDashboards + dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 + checks: + - manifest:component +# - name: functionalTestDashboards +# repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git +# ref: "main" +# checks: +# - manifest:component From c48dcbd0444677ff60ad49048c1956881b04ebe4 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 7 Dec 2021 16:59:54 -0500 Subject: [PATCH 09/20] More changes to template and bundle code to make build 1.1.1 opensearch runs Signed-off-by: Peter Zhu --- .../release-1.1.1-plugin-issues-min.md | 53 +++++++++++++++++++ .../release-1.1.1-plugin-issues.md | 4 +- .../release-1.3.0-plugin-issues.md | 1 - manifests/1.1.1/opensearch-1.1.1.yml | 16 +++--- src/build_workflow/builder_from_source.py | 3 +- 5 files changed, 65 insertions(+), 12 deletions(-) create mode 100644 .github/meta_issue_template/release-1.1.1-plugin-issues-min.md diff --git a/.github/meta_issue_template/release-1.1.1-plugin-issues-min.md b/.github/meta_issue_template/release-1.1.1-plugin-issues-min.md new file mode 100644 index 0000000000..06959d869a --- /dev/null +++ b/.github/meta_issue_template/release-1.1.1-plugin-issues-min.md @@ -0,0 +1,53 @@ +This is a component issue for release 1.1.1. +Coming from [release issue 1.1.1](https://github.com/opensearch-project/opensearch-build/issues/870), release version 1.1.1. Please follow the following checklist. + +
How to use this component issue +

+ +## This Component Issue +This component issue captures the state of the OpenSearch release, on component/plugin level, its assignee is responsible for driving the release of the component. Please contact them or @mention them on this issue for help. + +## Release Steps +There are several steps to the release process, components that are behind present risk to the release. Component owners resolve tasks on this ticket to communicate with the overall release owner. + +Steps have completion dates for coordinating efforts between the components of a release; components can start as soon as they are ready far in advance of a future release. + +You can find all the corresponding dates of each step in the release issue above. + +

+
+ + +### You can find all the date in above issue +### (We make changes to both OpenSearch and OpenSearch-Dashboards for 1.1.1) + +### Preparation + +- [ ] Assign this issue to a release owner. +- [ ] All the tasks in this issue have been reviewed by the release owner. +- [ ] Create, update, triage and label all features and issues targeted for this release with v1.1.1. + +### CI/CD + +- [ ] If including changes in this release, increment plugin version on 1.1 branch to `1.1.1`, otherwise stay on `1.1.0`. +- [ ] All code changes for 1.1.1 are complete. +- [ ] Ensure working and passing CI. + +### Pre-Release + +- [ ] Merge any changes to 1.1 you need for the patch +- [ ] Complete integration and sanity tests, and update results in the comment, contact corresponding assigner in meta issue above if needed. +- [ ] Fix bugs that you find during the integration test, wait for a new build and test again. +- [ ] All intermittent test failures have issues filed + +### Release + +- [ ] Complete [documentation](https://github.com/opensearch-project/documentation-website). +- [ ] Gather, review and publish release notes. +- [ ] Verify all issued labeled for this release are closed or labelled for the next release. + +### Post Release + +- [ ] Create [a release tag](https://github.com/opensearch-project/.github/blob/main/RELEASING.md#tagging). +- [ ] Suggest improvements to [this template](https://github.com/opensearch-project/opensearch-build/blob/main/.github/ISSUE_TEMPLATE/release_template.md). +- [ ] Conduct a postmortem, and publish its results. diff --git a/.github/meta_issue_template/release-1.1.1-plugin-issues.md b/.github/meta_issue_template/release-1.1.1-plugin-issues.md index 62ae20b44c..ebfaa64794 100644 --- a/.github/meta_issue_template/release-1.1.1-plugin-issues.md +++ b/.github/meta_issue_template/release-1.1.1-plugin-issues.md @@ -19,7 +19,7 @@ You can find all the corresponding dates of each step in the release issue above ### You can find all the date in above issue -### (We only make changes to OpenSearch-Dashboards to 1.1.1, therefore, OpenSearch stays 1.1.1.) +### (We make changes to both OpenSearch and OpenSearch-Dashboards for 1.1.1) ### Preparation @@ -29,7 +29,7 @@ You can find all the corresponding dates of each step in the release issue above ### CI/CD -- [ ] If including changes in this release, increment plugin version on 1.1 branch to `1.1.1.0`, otherwise stay on `1.1.1.0`. +- [ ] If including changes in this release, increment plugin version on 1.1 branch to `1.1.1.0`, otherwise stay on `1.1.0.0`. - [ ] All code changes for 1.1.1 are complete. - [ ] Ensure working and passing CI. diff --git a/.github/meta_issue_template/release-1.3.0-plugin-issues.md b/.github/meta_issue_template/release-1.3.0-plugin-issues.md index be601f311f..1dc5ee8a79 100644 --- a/.github/meta_issue_template/release-1.3.0-plugin-issues.md +++ b/.github/meta_issue_template/release-1.3.0-plugin-issues.md @@ -19,7 +19,6 @@ You can find all the corresponding dates of each step in the release issue above ### You can find all the date in above issue -### (We only make changes to OpenSearch-Dashboards to 1.3.0, therefore, OpenSearch stays 1.3.0.) ### Preparation diff --git a/manifests/1.1.1/opensearch-1.1.1.yml b/manifests/1.1.1/opensearch-1.1.1.yml index 2137df283f..f418179de1 100644 --- a/manifests/1.1.1/opensearch-1.1.1.yml +++ b/manifests/1.1.1/opensearch-1.1.1.yml @@ -9,14 +9,6 @@ build: patches: - 1.1.0 components: - - name: dashboards-reports - repository: https://github.com/opensearch-project/dashboards-reports.git - working_directory: reports-scheduler - ref: "1.1" - platforms: - - linux - checks: - - manifest:component - name: OpenSearch dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: @@ -29,6 +21,14 @@ components: dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: - manifest:component + - name: dashboards-reports + repository: https://github.com/opensearch-project/dashboards-reports.git + working_directory: reports-scheduler + ref: "1.1" + platforms: + - linux + checks: + - manifest:component - name: sql dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: diff --git a/src/build_workflow/builder_from_source.py b/src/build_workflow/builder_from_source.py index ce4f700a5e..be1941154e 100644 --- a/src/build_workflow/builder_from_source.py +++ b/src/build_workflow/builder_from_source.py @@ -34,7 +34,8 @@ def build(self, build_recorder): "bash", build_script, "-v", - self.target.version, + #self.target.version, + self.target.patches[0], "-p", self.target.platform, "-a", From d166b9b0783f4f5cf3b34fc4657c896c10de0138 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 7 Dec 2021 19:25:27 -0500 Subject: [PATCH 10/20] Add more changes Signed-off-by: Peter Zhu --- jenkins/opensearch/Jenkinsfile | 156 ++++++++++++++++----------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/jenkins/opensearch/Jenkinsfile b/jenkins/opensearch/Jenkinsfile index d466a7cb5d..5abe5630d0 100644 --- a/jenkins/opensearch/Jenkinsfile +++ b/jenkins/opensearch/Jenkinsfile @@ -2,12 +2,12 @@ lib = library(identifier: "jenkins@20211123", retriever: legacySCM(scm)) pipeline { agent none - triggers { - parameterizedCron ''' - H */2 * * * %INPUT_MANIFEST=1.3.0/opensearch-1.3.0.yml - H 1 * * * %INPUT_MANIFEST=2.0.0/opensearch-2.0.0.yml - ''' - } + //triggers { + // parameterizedCron ''' + // H */2 * * * %INPUT_MANIFEST=1.3.0/opensearch-1.3.0.yml + // H 1 * * * %INPUT_MANIFEST=2.0.0/opensearch-2.0.0.yml + // ''' + //} parameters { string( name: 'INPUT_MANIFEST', @@ -32,35 +32,35 @@ pipeline { } stage('build') { parallel { - stage('build-snapshot') { - environment { - SNAPSHOT_REPO_URL = "https://aws.oss.sonatype.org/content/repositories/snapshots/" - } - agent { - docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' - image dockerAgent.image - args dockerAgent.args - alwaysPull true - } - } - steps { - script { - git url: 'https://github.com/opensearch-project/opensearch-build.git', branch: 'main' - buildManifest( - snapshot: true - ) - withCredentials([usernamePassword(credentialsId: 'Sonatype', usernameVariable: 'SONATYPE_USERNAME', passwordVariable: 'SONATYPE_PASSWORD')]) { - sh('$WORKSPACE/publish/publish-snapshot.sh $WORKSPACE/builds/opensearch/maven') - } - } - } - post { - always { - postCleanup() - } - } - } + //stage('build-snapshot') { + // environment { + // SNAPSHOT_REPO_URL = "https://aws.oss.sonatype.org/content/repositories/snapshots/" + // } + // agent { + // docker { + // label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + // image dockerAgent.image + // args dockerAgent.args + // alwaysPull true + // } + // } + // steps { + // script { + // git url: 'https://github.com/opensearch-project/opensearch-build.git', branch: 'main' + // buildManifest( + // snapshot: true + // ) + // withCredentials([usernamePassword(credentialsId: 'Sonatype', usernameVariable: 'SONATYPE_USERNAME', passwordVariable: 'SONATYPE_PASSWORD')]) { + // sh('$WORKSPACE/publish/publish-snapshot.sh $WORKSPACE/builds/opensearch/maven') + // } + // } + // } + // post { + // always { + // postCleanup() + // } + // } + //} stage('build-x64') { agent { docker { @@ -81,51 +81,51 @@ pipeline { } } } - stage('build-arm64') { - agent { - docker { - label 'Jenkins-Agent-al2-arm64-c6g4xlarge-Docker-Host' - image dockerAgent.image - args dockerAgent.args - alwaysPull true - } - } - steps { - script { - buildAssembleUpload() - } - } - post { - always { - postCleanup() - } - } - } - } - } - stage('docker build') { - steps { - node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { - script { - buildDockerImage() - } - } + //stage('build-arm64') { + // agent { + // docker { + // label 'Jenkins-Agent-al2-arm64-c6g4xlarge-Docker-Host' + // image dockerAgent.image + // args dockerAgent.args + // alwaysPull true + // } + // } + // steps { + // script { + // buildAssembleUpload() + // } + // } + // post { + // always { + // postCleanup() + // } + // } + //} } } + //stage('docker build') { + // steps { + // node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { + // script { + // buildDockerImage() + // } + // } + // } + //} } post { success { node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { script { - def stashed = lib.jenkins.Messages.new(this).get(['build-x64', 'build-arm64']) + //def stashed = lib.jenkins.Messages.new(this).get(['build-x64', 'build-arm64']) - publishNotification( - icon: ':white_check_mark:', - message: 'Successful Build', - extra: stashed, - credentialsId: 'BUILD_NOTICE_WEBHOOK', - manifest: "${INPUT_MANIFEST}" - ) + //publishNotification( + // icon: ':white_check_mark:', + // message: 'Successful Build', + // extra: stashed, + // credentialsId: 'BUILD_NOTICE_WEBHOOK', + // manifest: "${INPUT_MANIFEST}" + //) postCleanup() } @@ -134,12 +134,12 @@ pipeline { failure { node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { script { - publishNotification( - icon: ':warning:', - message: 'Failed Build', - credentialsId: 'BUILD_NOTICE_WEBHOOK', - manifest: "${INPUT_MANIFEST}" - ) + //publishNotification( + // icon: ':warning:', + // message: 'Failed Build', + // credentialsId: 'BUILD_NOTICE_WEBHOOK', + // manifest: "${INPUT_MANIFEST}" + //) postCleanup() } From 423adfe7354d13853eb6d2b0d5c7dbd7c14b1472 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 7 Dec 2021 19:40:48 -0500 Subject: [PATCH 11/20] Add arm64 and docker build code Signed-off-by: Peter Zhu --- jenkins/opensearch/Jenkinsfile | 58 +++++++++++++++++----------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/jenkins/opensearch/Jenkinsfile b/jenkins/opensearch/Jenkinsfile index 5abe5630d0..d0ccafe6e7 100644 --- a/jenkins/opensearch/Jenkinsfile +++ b/jenkins/opensearch/Jenkinsfile @@ -81,37 +81,37 @@ pipeline { } } } - //stage('build-arm64') { - // agent { - // docker { - // label 'Jenkins-Agent-al2-arm64-c6g4xlarge-Docker-Host' - // image dockerAgent.image - // args dockerAgent.args - // alwaysPull true - // } - // } - // steps { - // script { - // buildAssembleUpload() - // } - // } - // post { - // always { - // postCleanup() - // } - // } - //} + stage('build-arm64') { + agent { + docker { + label 'Jenkins-Agent-al2-arm64-c6g4xlarge-Docker-Host' + image dockerAgent.image + args dockerAgent.args + alwaysPull true + } + } + steps { + script { + buildAssembleUpload() + } + } + post { + always { + postCleanup() + } + } + } + } + } + stage('docker build') { + steps { + node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { + script { + buildDockerImage() + } + } } } - //stage('docker build') { - // steps { - // node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { - // script { - // buildDockerImage() - // } - // } - // } - //} } post { success { From 438bc1646483b64d2d26510908caf6fad95dc6c8 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 8 Dec 2021 14:49:49 -0500 Subject: [PATCH 12/20] Restore Jenkinsfile Signed-off-by: Peter Zhu --- jenkins/opensearch/Jenkinsfile | 99 +++++++++++++++++----------------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/jenkins/opensearch/Jenkinsfile b/jenkins/opensearch/Jenkinsfile index d0ccafe6e7..cececeb162 100644 --- a/jenkins/opensearch/Jenkinsfile +++ b/jenkins/opensearch/Jenkinsfile @@ -2,12 +2,12 @@ lib = library(identifier: "jenkins@20211123", retriever: legacySCM(scm)) pipeline { agent none - //triggers { - // parameterizedCron ''' - // H */2 * * * %INPUT_MANIFEST=1.3.0/opensearch-1.3.0.yml - // H 1 * * * %INPUT_MANIFEST=2.0.0/opensearch-2.0.0.yml - // ''' - //} + triggers { + parameterizedCron ''' + H */2 * * * %INPUT_MANIFEST=1.3.0/opensearch-1.3.0.yml + H 1 * * * %INPUT_MANIFEST=2.0.0/opensearch-2.0.0.yml + ''' + } parameters { string( name: 'INPUT_MANIFEST', @@ -32,35 +32,35 @@ pipeline { } stage('build') { parallel { - //stage('build-snapshot') { - // environment { - // SNAPSHOT_REPO_URL = "https://aws.oss.sonatype.org/content/repositories/snapshots/" - // } - // agent { - // docker { - // label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' - // image dockerAgent.image - // args dockerAgent.args - // alwaysPull true - // } - // } - // steps { - // script { - // git url: 'https://github.com/opensearch-project/opensearch-build.git', branch: 'main' - // buildManifest( - // snapshot: true - // ) - // withCredentials([usernamePassword(credentialsId: 'Sonatype', usernameVariable: 'SONATYPE_USERNAME', passwordVariable: 'SONATYPE_PASSWORD')]) { - // sh('$WORKSPACE/publish/publish-snapshot.sh $WORKSPACE/builds/opensearch/maven') - // } - // } - // } - // post { - // always { - // postCleanup() - // } - // } - //} + stage('build-snapshot') { + environment { + SNAPSHOT_REPO_URL = "https://aws.oss.sonatype.org/content/repositories/snapshots/" + } + agent { + docker { + label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + image dockerAgent.image + args dockerAgent.args + alwaysPull true + } + } + steps { + script { + git url: 'https://github.com/opensearch-project/opensearch-build.git', branch: 'main' + buildManifest( + snapshot: true + ) + withCredentials([usernamePassword(credentialsId: 'Sonatype', usernameVariable: 'SONATYPE_USERNAME', passwordVariable: 'SONATYPE_PASSWORD')]) { + sh('$WORKSPACE/publish/publish-snapshot.sh $WORKSPACE/builds/opensearch/maven') + } + } + } + post { + always { + postCleanup() + } + } + } stage('build-x64') { agent { docker { @@ -117,15 +117,15 @@ pipeline { success { node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { script { - //def stashed = lib.jenkins.Messages.new(this).get(['build-x64', 'build-arm64']) + def stashed = lib.jenkins.Messages.new(this).get(['build-x64', 'build-arm64']) - //publishNotification( - // icon: ':white_check_mark:', - // message: 'Successful Build', - // extra: stashed, - // credentialsId: 'BUILD_NOTICE_WEBHOOK', - // manifest: "${INPUT_MANIFEST}" - //) + publishNotification( + icon: ':white_check_mark:', + message: 'Successful Build', + extra: stashed, + credentialsId: 'BUILD_NOTICE_WEBHOOK', + manifest: "${INPUT_MANIFEST}" + ) postCleanup() } @@ -134,12 +134,12 @@ pipeline { failure { node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { script { - //publishNotification( - // icon: ':warning:', - // message: 'Failed Build', - // credentialsId: 'BUILD_NOTICE_WEBHOOK', - // manifest: "${INPUT_MANIFEST}" - //) + publishNotification( + icon: ':warning:', + message: 'Failed Build', + credentialsId: 'BUILD_NOTICE_WEBHOOK', + manifest: "${INPUT_MANIFEST}" + ) postCleanup() } @@ -147,3 +147,4 @@ pipeline { } } } + From b09dfab1d174c17ea66cd1996e409d80bd8d3231 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 8 Dec 2021 14:51:18 -0500 Subject: [PATCH 13/20] Restore Jenkinsfile Signed-off-by: Peter Zhu --- jenkins/opensearch/Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/jenkins/opensearch/Jenkinsfile b/jenkins/opensearch/Jenkinsfile index cececeb162..d466a7cb5d 100644 --- a/jenkins/opensearch/Jenkinsfile +++ b/jenkins/opensearch/Jenkinsfile @@ -147,4 +147,3 @@ pipeline { } } } - From 6ff89d3883e2afc50783807243847d9192d1634d Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 8 Dec 2021 14:52:39 -0500 Subject: [PATCH 14/20] Restore build from source python code Signed-off-by: Peter Zhu --- src/build_workflow/builder_from_source.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/build_workflow/builder_from_source.py b/src/build_workflow/builder_from_source.py index be1941154e..ce4f700a5e 100644 --- a/src/build_workflow/builder_from_source.py +++ b/src/build_workflow/builder_from_source.py @@ -34,8 +34,7 @@ def build(self, build_recorder): "bash", build_script, "-v", - #self.target.version, - self.target.patches[0], + self.target.version, "-p", self.target.platform, "-a", From 9633ec8eb0175055831be17f6fb3a4ab562f0402 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 8 Dec 2021 15:02:31 -0500 Subject: [PATCH 15/20] Readd functional tests Signed-off-by: Peter Zhu --- manifests/1.1.1/opensearch-dashboards-1.1.1.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/1.1.1/opensearch-dashboards-1.1.1.yml b/manifests/1.1.1/opensearch-dashboards-1.1.1.yml index 6928a55b50..e97ccd7370 100644 --- a/manifests/1.1.1/opensearch-dashboards-1.1.1.yml +++ b/manifests/1.1.1/opensearch-dashboards-1.1.1.yml @@ -53,8 +53,8 @@ components: dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 checks: - manifest:component -# - name: functionalTestDashboards -# repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git -# ref: "main" -# checks: -# - manifest:component + - name: functionalTestDashboards + repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git + ref: "main" + checks: + - manifest:component From 8024c90ad13039e3c71dca026b415a1b45bc105b Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 8 Dec 2021 15:08:58 -0500 Subject: [PATCH 16/20] Switch checks of build from source to gradle related checks Signed-off-by: Peter Zhu --- manifests/1.1.1/opensearch-1.1.1.yml | 3 ++- manifests/1.1.1/opensearch-dashboards-1.1.1.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/manifests/1.1.1/opensearch-1.1.1.yml b/manifests/1.1.1/opensearch-1.1.1.yml index f418179de1..4e36a61258 100644 --- a/manifests/1.1.1/opensearch-1.1.1.yml +++ b/manifests/1.1.1/opensearch-1.1.1.yml @@ -28,7 +28,8 @@ components: platforms: - linux checks: - - manifest:component + - gradle:publish + - gradle:properties:version - name: sql dist: https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930 checks: diff --git a/manifests/1.1.1/opensearch-dashboards-1.1.1.yml b/manifests/1.1.1/opensearch-dashboards-1.1.1.yml index e97ccd7370..1f4cbdc919 100644 --- a/manifests/1.1.1/opensearch-dashboards-1.1.1.yml +++ b/manifests/1.1.1/opensearch-dashboards-1.1.1.yml @@ -16,7 +16,8 @@ components: platforms: - linux checks: - - manifest:component + - gradle:publish + - gradle:properties:version - name: OpenSearch-Dashboards dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 checks: From a01c1af5ef2d6e6920f6e586065d3667886104cd Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 8 Dec 2021 15:13:24 -0500 Subject: [PATCH 17/20] Remove checks for dashboards as it is not there yet Signed-off-by: Peter Zhu --- .../1.1.1/opensearch-dashboards-1.1.1.yml | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/manifests/1.1.1/opensearch-dashboards-1.1.1.yml b/manifests/1.1.1/opensearch-dashboards-1.1.1.yml index 1f4cbdc919..2ff7dc16d4 100644 --- a/manifests/1.1.1/opensearch-dashboards-1.1.1.yml +++ b/manifests/1.1.1/opensearch-dashboards-1.1.1.yml @@ -15,47 +15,24 @@ components: working_directory: "dashboards-reports" platforms: - linux - checks: - - gradle:publish - - gradle:properties:version - name: OpenSearch-Dashboards dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 - checks: - - manifest:component - name: alertingDashboards dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 - checks: - - manifest:component - name: securityDashboards dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 - checks: - - manifest:component - name: indexManagementDashboards dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 - checks: - - manifest:component - name: queryWorkbenchDashboards dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 - checks: - - manifest:component - name: notebooksDashboards dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 - checks: - - manifest:component - name: ganttChartDashboards dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 - checks: - - manifest:component - name: traceAnalyticsDashboards dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 - checks: - - manifest:component - name: anomalyDetectionDashboards dist: https://ci.opensearch.org/ci/dbc/bundle-build-dashboards/1.1.0/20210930 - checks: - - manifest:component - name: functionalTestDashboards repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git ref: "main" - checks: - - manifest:component From 10c4f4df5a1e51c89d50b03414f0b18998d0e9b8 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 8 Dec 2021 17:08:10 -0500 Subject: [PATCH 18/20] Fix ci check link is not matching the new setup in s3 Signed-off-by: Peter Zhu --- src/ci_workflow/ci_check_manifest_component.py | 4 +++- src/ci_workflow/ci_input_manifest.py | 2 +- src/ci_workflow/ci_target.py | 4 +++- .../test_ci_check_gradle_dependencies.py | 2 +- .../test_ci_check_gradle_dependencies_opensearch.py | 6 +++--- .../tests_ci_workflow/test_ci_check_gradle_properties.py | 4 ++-- .../test_ci_check_gradle_properties_version.py | 2 +- .../test_ci_check_gradle_publish_to_maven_local.py | 4 ++-- tests/tests_ci_workflow/test_ci_target.py | 8 ++++---- 9 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/ci_workflow/ci_check_manifest_component.py b/src/ci_workflow/ci_check_manifest_component.py index bdbbc7b1fa..1fd178f648 100644 --- a/src/ci_workflow/ci_check_manifest_component.py +++ b/src/ci_workflow/ci_check_manifest_component.py @@ -18,7 +18,9 @@ def __init__(self, component, url): def check(self): for architecture in BuildArgs.SUPPORTED_ARCHITECTURES: - url = "/".join([self.component.dist, architecture, "manifest.yml"]) + # Since we only have 'linux' builds now we hard code it to 'linux' + # Once we have all platform builds we can adding a second loop for 'BuildArgs.SUPPORTED_PLATFORMS' + url = "/".join([self.component.dist, "linux", architecture, "builds", self.target.name, "manifest.yml"]) self.build_manifest = BuildManifest.from_url(url) if self.component.name in self.build_manifest.components: logging.info(f"Found {self.component.name} in {url}.") diff --git a/src/ci_workflow/ci_input_manifest.py b/src/ci_workflow/ci_input_manifest.py index ba204033b4..1f891be6dc 100644 --- a/src/ci_workflow/ci_input_manifest.py +++ b/src/ci_workflow/ci_input_manifest.py @@ -19,7 +19,7 @@ def __init__(self, file, args): def __check__(self): - target = CiTarget(version=self.manifest.build.version, snapshot=self.args.snapshot) + target = CiTarget(version=self.manifest.build.version, name=self.manifest.build.name.lower().replace(' ', '-'), snapshot=self.args.snapshot) with TemporaryDirectory(keep=self.args.keep, chdir=True) as work_dir: logging.info(f"Sanity-testing in {work_dir.name}") diff --git a/src/ci_workflow/ci_target.py b/src/ci_workflow/ci_target.py index c2d0bf2a84..7aa76a61dc 100644 --- a/src/ci_workflow/ci_target.py +++ b/src/ci_workflow/ci_target.py @@ -7,10 +7,12 @@ class CiTarget: version: str + name: str snapshot: bool - def __init__(self, version, snapshot=True): + def __init__(self, version, name, snapshot=True): self.version = version + self.name = name self.snapshot = snapshot @property diff --git a/tests/tests_ci_workflow/test_ci_check_gradle_dependencies.py b/tests/tests_ci_workflow/test_ci_check_gradle_dependencies.py index d6b9010444..80fb89642b 100644 --- a/tests/tests_ci_workflow/test_ci_check_gradle_dependencies.py +++ b/tests/tests_ci_workflow/test_ci_check_gradle_dependencies.py @@ -24,7 +24,7 @@ def __mock_dependencies(self, props="", snapshot=False, gradle_project=None): return TestCiCheckGradleDependencies.DummyDependencies( component=MagicMock(), git_repo=git_repo, - target=CiTarget(version="1.1.0", snapshot=snapshot), + target=CiTarget(version="1.1.0", name="opensearch", snapshot=snapshot), args=gradle_project, ) diff --git a/tests/tests_ci_workflow/test_ci_check_gradle_dependencies_opensearch.py b/tests/tests_ci_workflow/test_ci_check_gradle_dependencies_opensearch.py index 1aeaea9238..6d7b94d5aa 100644 --- a/tests/tests_ci_workflow/test_ci_check_gradle_dependencies_opensearch.py +++ b/tests/tests_ci_workflow/test_ci_check_gradle_dependencies_opensearch.py @@ -22,7 +22,7 @@ def __mock_check(self, props=None): return CiCheckGradleDependenciesOpenSearchVersion( component=MagicMock(), git_repo=MagicMock(), - target=CiTarget(version="1.1.0", snapshot=True), + target=CiTarget(version="1.1.0", name="opensearch", snapshot=True), args=None, ) @@ -52,7 +52,7 @@ def test_executes_gradle_command(self): check = CiCheckGradleDependenciesOpenSearchVersion( component=MagicMock(), git_repo=MagicMock(), - target=CiTarget(version="1.1.0", snapshot=True), + target=CiTarget(version="1.1.0", name="opensearch", snapshot=True), args=None, ) check.git_repo.output.assert_called_once_with( @@ -63,7 +63,7 @@ def test_executes_gradle_command_with_arg(self): check = CiCheckGradleDependenciesOpenSearchVersion( component=MagicMock(), git_repo=MagicMock(), - target=CiTarget(version="1.1.0", snapshot=True), + target=CiTarget(version="1.1.0", name="opensearch", snapshot=True), args="plugin", ) check.git_repo.output.assert_called_once_with( diff --git a/tests/tests_ci_workflow/test_ci_check_gradle_properties.py b/tests/tests_ci_workflow/test_ci_check_gradle_properties.py index a6496640bf..6acafa2aca 100644 --- a/tests/tests_ci_workflow/test_ci_check_gradle_properties.py +++ b/tests/tests_ci_workflow/test_ci_check_gradle_properties.py @@ -23,7 +23,7 @@ def test_executes_gradle_properties(self): TestCiCheckGradleProperties.DummyProperties( component=MagicMock(), git_repo=git_repo, - target=CiTarget(version="1.1.0", snapshot=False), + target=CiTarget(version="1.1.0", name="opensearch", snapshot=False), ) git_repo.output.assert_called_once_with("./gradlew properties -Dopensearch.version=1.1.0 -Dbuild.snapshot=false") @@ -35,7 +35,7 @@ def test_executes_gradle_properties_snapshot(self): TestCiCheckGradleProperties.DummyProperties( component=MagicMock(), git_repo=git_repo, - target=CiTarget(version="1.1.0", snapshot=True), + target=CiTarget(version="1.1.0", name="opensearch", snapshot=True), ) git_repo.output.assert_called_once_with("./gradlew properties -Dopensearch.version=1.1.0-SNAPSHOT -Dbuild.snapshot=true") diff --git a/tests/tests_ci_workflow/test_ci_check_gradle_properties_version.py b/tests/tests_ci_workflow/test_ci_check_gradle_properties_version.py index dca2c09646..225626ad35 100644 --- a/tests/tests_ci_workflow/test_ci_check_gradle_properties_version.py +++ b/tests/tests_ci_workflow/test_ci_check_gradle_properties_version.py @@ -20,7 +20,7 @@ def __mock_check(self, props=None, component=None, snapshot=True): return CiCheckGradlePropertiesVersion( component=component or MagicMock(), git_repo=MagicMock(), - target=CiTarget(version="1.1.0", snapshot=snapshot), + target=CiTarget(version="1.1.0", name="opensearch", snapshot=snapshot), ) def test_has_version(self): diff --git a/tests/tests_ci_workflow/test_ci_check_gradle_publish_to_maven_local.py b/tests/tests_ci_workflow/test_ci_check_gradle_publish_to_maven_local.py index 6e5ca2c71b..ebd737d363 100644 --- a/tests/tests_ci_workflow/test_ci_check_gradle_publish_to_maven_local.py +++ b/tests/tests_ci_workflow/test_ci_check_gradle_publish_to_maven_local.py @@ -16,7 +16,7 @@ def test_executes_gradle_command(self): check = CiCheckGradlePublishToMavenLocal( component=MagicMock(), git_repo=MagicMock(), - target=CiTarget(version="1.1.0", snapshot=False), + target=CiTarget(version="1.1.0", name="opensearch", snapshot=False), ) check.check() check.git_repo.execute.assert_called_once_with("./gradlew publishToMavenLocal -Dopensearch.version=1.1.0 -Dbuild.snapshot=false") @@ -25,7 +25,7 @@ def test_executes_gradle_command_snapshot(self): check = CiCheckGradlePublishToMavenLocal( component=MagicMock(), git_repo=MagicMock(), - target=CiTarget(version="1.1.0", snapshot=True), + target=CiTarget(version="1.1.0", name="opensearch", snapshot=True), ) check.check() check.git_repo.execute.assert_called_once_with("./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT -Dbuild.snapshot=true") diff --git a/tests/tests_ci_workflow/test_ci_target.py b/tests/tests_ci_workflow/test_ci_target.py index 156ab0da5f..710ed5d403 100644 --- a/tests/tests_ci_workflow/test_ci_target.py +++ b/tests/tests_ci_workflow/test_ci_target.py @@ -11,19 +11,19 @@ class TestCiTarget(unittest.TestCase): def test_opensearch_version(self): - self.assertEqual(CiTarget(version="1.1.0", snapshot=False).opensearch_version, "1.1.0") + self.assertEqual(CiTarget(version="1.1.0", name="opensearch", snapshot=False).opensearch_version, "1.1.0") def test_opensearch_version_snapshot(self): self.assertEqual( - CiTarget(version="1.1.0", snapshot=True).opensearch_version, + CiTarget(version="1.1.0", name="opensearch", snapshot=True).opensearch_version, "1.1.0-SNAPSHOT", ) def test_component_version(self): - self.assertEqual(CiTarget(version="1.1.0", snapshot=False).component_version, "1.1.0.0") + self.assertEqual(CiTarget(version="1.1.0", name="opensearch", snapshot=False).component_version, "1.1.0.0") def test_component_version_snapshot(self): self.assertEqual( - CiTarget(version="1.1.0", snapshot=True).component_version, + CiTarget(version="1.1.0", name="opensearch", snapshot=True).component_version, "1.1.0.0-SNAPSHOT", ) From 3ec4b082b6e01ece41297bbb6629345e1289966e Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 8 Dec 2021 18:36:32 -0500 Subject: [PATCH 19/20] Add more changes to resolve issues with templates and tests Signed-off-by: Peter Zhu --- ...in.md => release-1.1.1-component-issues-min.md} | 14 ++++++++------ ...issues.md => release-1.1.1-component-issues.md} | 14 ++++++++------ ...issues.md => release-1.3.0-component-issues.md} | 13 ++++++++----- src/ci_workflow/ci_check_manifest_component.py | 2 +- src/ci_workflow/ci_input_manifest.py | 2 +- .../tests_ci_workflow/test_ci_check_lists_dist.py | 7 ++++--- .../test_ci_check_manifest_component.py | 13 +++++++------ 7 files changed, 37 insertions(+), 28 deletions(-) rename .github/meta_issue_template/{release-1.1.1-plugin-issues-min.md => release-1.1.1-component-issues-min.md} (79%) rename .github/meta_issue_template/{release-1.1.1-plugin-issues.md => release-1.1.1-component-issues.md} (79%) rename .github/meta_issue_template/{release-1.3.0-plugin-issues.md => release-1.3.0-component-issues.md} (83%) diff --git a/.github/meta_issue_template/release-1.1.1-plugin-issues-min.md b/.github/meta_issue_template/release-1.1.1-component-issues-min.md similarity index 79% rename from .github/meta_issue_template/release-1.1.1-plugin-issues-min.md rename to .github/meta_issue_template/release-1.1.1-component-issues-min.md index 06959d869a..fa6c68b087 100644 --- a/.github/meta_issue_template/release-1.1.1-plugin-issues-min.md +++ b/.github/meta_issue_template/release-1.1.1-component-issues-min.md @@ -19,7 +19,6 @@ You can find all the corresponding dates of each step in the release issue above ### You can find all the date in above issue -### (We make changes to both OpenSearch and OpenSearch-Dashboards for 1.1.1) ### Preparation @@ -27,18 +26,21 @@ You can find all the corresponding dates of each step in the release issue above - [ ] All the tasks in this issue have been reviewed by the release owner. - [ ] Create, update, triage and label all features and issues targeted for this release with v1.1.1. +### What should I do if my plugin isn't making any changes? +- [ ] If including changes in this release, increment the version on 1.1 branch to `1.1.1`, otherwise stay on `1.1.0`. + ### CI/CD -- [ ] If including changes in this release, increment plugin version on 1.1 branch to `1.1.1`, otherwise stay on `1.1.0`. - [ ] All code changes for 1.1.1 are complete. - [ ] Ensure working and passing CI. ### Pre-Release - [ ] Merge any changes to 1.1 you need for the patch -- [ ] Complete integration and sanity tests, and update results in the comment, contact corresponding assigner in meta issue above if needed. -- [ ] Fix bugs that you find during the integration test, wait for a new build and test again. -- [ ] All intermittent test failures have issues filed +- [ ] Complete integration and sanity tests, and update results in the comment, [example](https://github.com/opensearch-project/opensearch-build/issues/1118). +- [ ] Find/fix bugs using latest tarball and docker image provided in meta issue. +- [ ] Completed release candidate testing build #TBD. +- [ ] All intermittent test failures have issues filed. ### Release @@ -50,4 +52,4 @@ You can find all the corresponding dates of each step in the release issue above - [ ] Create [a release tag](https://github.com/opensearch-project/.github/blob/main/RELEASING.md#tagging). - [ ] Suggest improvements to [this template](https://github.com/opensearch-project/opensearch-build/blob/main/.github/ISSUE_TEMPLATE/release_template.md). -- [ ] Conduct a postmortem, and publish its results. +- [ ] Conduct a retrospect, and publish its results. diff --git a/.github/meta_issue_template/release-1.1.1-plugin-issues.md b/.github/meta_issue_template/release-1.1.1-component-issues.md similarity index 79% rename from .github/meta_issue_template/release-1.1.1-plugin-issues.md rename to .github/meta_issue_template/release-1.1.1-component-issues.md index ebfaa64794..8fc025868a 100644 --- a/.github/meta_issue_template/release-1.1.1-plugin-issues.md +++ b/.github/meta_issue_template/release-1.1.1-component-issues.md @@ -19,7 +19,6 @@ You can find all the corresponding dates of each step in the release issue above ### You can find all the date in above issue -### (We make changes to both OpenSearch and OpenSearch-Dashboards for 1.1.1) ### Preparation @@ -27,18 +26,21 @@ You can find all the corresponding dates of each step in the release issue above - [ ] All the tasks in this issue have been reviewed by the release owner. - [ ] Create, update, triage and label all features and issues targeted for this release with v1.1.1. +### What should I do if my plugin isn't making any changes? +- [ ] If including changes in this release, increment the version on 1.1 branch to `1.1.1.0`, otherwise stay on `1.1.0.0`. + ### CI/CD -- [ ] If including changes in this release, increment plugin version on 1.1 branch to `1.1.1.0`, otherwise stay on `1.1.0.0`. - [ ] All code changes for 1.1.1 are complete. - [ ] Ensure working and passing CI. ### Pre-Release - [ ] Merge any changes to 1.1 you need for the patch -- [ ] Complete integration and sanity tests, and update results in the comment, contact corresponding assigner in meta issue above if needed. -- [ ] Fix bugs that you find during the integration test, wait for a new build and test again. -- [ ] All intermittent test failures have issues filed +- [ ] Complete integration and sanity tests, and update results in the comment, [example](https://github.com/opensearch-project/opensearch-build/issues/1118). +- [ ] Find/fix bugs using latest tarball and docker image provided in meta issue. +- [ ] Completed release candidate testing build #TBD. +- [ ] All intermittent test failures have issues filed. ### Release @@ -50,4 +52,4 @@ You can find all the corresponding dates of each step in the release issue above - [ ] Create [a release tag](https://github.com/opensearch-project/.github/blob/main/RELEASING.md#tagging). - [ ] Suggest improvements to [this template](https://github.com/opensearch-project/opensearch-build/blob/main/.github/ISSUE_TEMPLATE/release_template.md). -- [ ] Conduct a postmortem, and publish its results. +- [ ] Conduct a retrospect, and publish its results. diff --git a/.github/meta_issue_template/release-1.3.0-plugin-issues.md b/.github/meta_issue_template/release-1.3.0-component-issues.md similarity index 83% rename from .github/meta_issue_template/release-1.3.0-plugin-issues.md rename to .github/meta_issue_template/release-1.3.0-component-issues.md index 1dc5ee8a79..06f43edc6e 100644 --- a/.github/meta_issue_template/release-1.3.0-plugin-issues.md +++ b/.github/meta_issue_template/release-1.3.0-component-issues.md @@ -27,9 +27,11 @@ You can find all the corresponding dates of each step in the release issue above - [ ] All the tasks in this issue have been reviewed by the release owner. - [ ] Create, update, triage and label all features and issues targeted for this release with v1.3.0. +### What should I do if my plugin isn't making any changes? +- [ ] If including changes in this release, increment the version on 1.3 branch to `1.3.0.0`, otherwise stay on `1.3.0.0`. + ### CI/CD -- [ ] If including changes in this release, increment plugin version on 1.3 branch to `1.3.0.0`, otherwise stay on `1.3.0.0`. - [ ] All code changes for 1.3.0 are complete. - [ ] Ensure working and passing CI. - [ ] Re(add) this repo to the (if not exist) [opensearch-dashboards input manifest](https://github.com/opensearch-project/opensearch-build/blob/main/manifests/1.3.0/opensearch-dashboards-1.3.0.yml). @@ -38,9 +40,10 @@ You can find all the corresponding dates of each step in the release issue above - [ ] Update your branch in the [opensearch-dashboards input manifest](https://github.com/opensearch-project/opensearch-build/blob/main/manifests/1.3.0/opensearch-dashboards-1.3.0.yml). - [ ] Merge any changes to 1.3 you need for the patch -- [ ] Complete integration tests, and update results in the comment, contact corresponding assigner in meta issue above if needed. -- [ ] Fix bugs that you find during the integration test, wait for a new build and test again. -- [ ] All intermittent test failures have issues filed +- [ ] Complete integration tests, and update results in the comment, [example](https://github.com/opensearch-project/opensearch-build/issues/1118). +- [ ] Find/fix bugs using latest tarball and docker image provided in meta issue. +- [ ] Completed release candidate testing build #TBD. +- [ ] All intermittent test failures have issues filed. ### Release @@ -52,4 +55,4 @@ You can find all the corresponding dates of each step in the release issue above - [ ] Create [a release tag](https://github.com/opensearch-project/.github/blob/main/RELEASING.md#tagging). - [ ] Suggest improvements to [this template](https://github.com/opensearch-project/opensearch-build/blob/main/.github/ISSUE_TEMPLATE/release_template.md). -- [ ] Conduct a postmortem, and publish its results. +- [ ] Conduct a retrospect, and publish its results. diff --git a/src/ci_workflow/ci_check_manifest_component.py b/src/ci_workflow/ci_check_manifest_component.py index 1fd178f648..95392b5ea2 100644 --- a/src/ci_workflow/ci_check_manifest_component.py +++ b/src/ci_workflow/ci_check_manifest_component.py @@ -19,7 +19,7 @@ def __init__(self, component, url): def check(self): for architecture in BuildArgs.SUPPORTED_ARCHITECTURES: # Since we only have 'linux' builds now we hard code it to 'linux' - # Once we have all platform builds we can adding a second loop for 'BuildArgs.SUPPORTED_PLATFORMS' + # Once we have all platform builds on S3 we can then add a second loop for 'BuildArgs.SUPPORTED_PLATFORMS' url = "/".join([self.component.dist, "linux", architecture, "builds", self.target.name, "manifest.yml"]) self.build_manifest = BuildManifest.from_url(url) if self.component.name in self.build_manifest.components: diff --git a/src/ci_workflow/ci_input_manifest.py b/src/ci_workflow/ci_input_manifest.py index 1f891be6dc..6f6ffe2cc2 100644 --- a/src/ci_workflow/ci_input_manifest.py +++ b/src/ci_workflow/ci_input_manifest.py @@ -19,7 +19,7 @@ def __init__(self, file, args): def __check__(self): - target = CiTarget(version=self.manifest.build.version, name=self.manifest.build.name.lower().replace(' ', '-'), snapshot=self.args.snapshot) + target = CiTarget(version=self.manifest.build.version, name=self.manifest.build.filename, snapshot=self.args.snapshot) with TemporaryDirectory(keep=self.args.keep, chdir=True) as work_dir: logging.info(f"Sanity-testing in {work_dir.name}") diff --git a/tests/tests_ci_workflow/test_ci_check_lists_dist.py b/tests/tests_ci_workflow/test_ci_check_lists_dist.py index c0a6a9578e..c0a3e1480b 100644 --- a/tests/tests_ci_workflow/test_ci_check_lists_dist.py +++ b/tests/tests_ci_workflow/test_ci_check_lists_dist.py @@ -6,9 +6,10 @@ import os import unittest -from unittest.mock import MagicMock, patch +from unittest.mock import patch from ci_workflow.ci_check_list_dist import CiCheckListDist +from ci_workflow.ci_target import CiTarget from manifests.build_manifest import BuildManifest from manifests.input_manifest import InputComponentFromDist @@ -25,7 +26,7 @@ def test_check(self, mock_manifest, *mocks): "dist": "url", "checks": ["manifest:component"] }) - list = CiCheckListDist(component, MagicMock()) + list = CiCheckListDist(component, CiTarget(version="1.1.0", name="opensearch", snapshot=True)) list.check() mock_manifest.assert_called() @@ -35,7 +36,7 @@ def test_invalid_check(self, *mocks): "dist": "url", "checks": ["invalid:check"] }) - list = CiCheckListDist(component, MagicMock()) + list = CiCheckListDist(component, CiTarget(version="1.1.0", name="opensearch", snapshot=True)) list.checkout("path") with self.assertRaises(CiCheckListDist.InvalidCheckError) as ctx: list.check() diff --git a/tests/tests_ci_workflow/test_ci_check_manifest_component.py b/tests/tests_ci_workflow/test_ci_check_manifest_component.py index e1f4daf788..c6f4d0a301 100644 --- a/tests/tests_ci_workflow/test_ci_check_manifest_component.py +++ b/tests/tests_ci_workflow/test_ci_check_manifest_component.py @@ -6,9 +6,10 @@ import os import unittest -from unittest.mock import MagicMock, call, patch +from unittest.mock import call, patch from ci_workflow.ci_check_manifest_component import CiCheckManifestComponent +from ci_workflow.ci_target import CiTarget from manifests.build_manifest import BuildManifest from manifests.input_manifest import InputComponentFromDist @@ -22,14 +23,14 @@ def test_retrieves_manifests(self, mock_manifest): check = CiCheckManifestComponent(InputComponentFromDist({ "name": "common-utils", "dist": "url" - }), MagicMock()) + }), CiTarget(version="1.1.0", name="opensearch", snapshot=True)) mock_manifest.from_url.return_value = BuildManifest.from_path(self.BUILD_MANIFEST) check.check() mock_manifest.from_url.assert_has_calls([ - call("url/x64/manifest.yml"), - call("url/arm64/manifest.yml") + call("url/linux/x64/builds/opensearch/manifest.yml"), + call("url/linux/arm64/builds/opensearch/manifest.yml"), ]) @patch("ci_workflow.ci_check_manifest_component.BuildManifest") @@ -37,11 +38,11 @@ def test_missing_component(self, mock_manifest): check = CiCheckManifestComponent(InputComponentFromDist({ "name": "does-not-exist", "dist": "url" - }), MagicMock()) + }), CiTarget(version="1.1.0", name="opensearch", snapshot=True)) mock_manifest.from_url.return_value = BuildManifest.from_path(self.BUILD_MANIFEST) with self.assertRaises(CiCheckManifestComponent.MissingComponentError) as ctx: check.check() - self.assertEqual(str(ctx.exception), "Missing does-not-exist in url/x64/manifest.yml.") + self.assertEqual(str(ctx.exception), "Missing does-not-exist in url/linux/x64/builds/opensearch/manifest.yml.") From 92b285e44726621d36f30c36a73a0a0b7943307d Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Thu, 9 Dec 2021 12:11:03 -0500 Subject: [PATCH 20/20] More updates to the templates sent to owners Signed-off-by: Peter Zhu --- .../release-1.1.1-component-issues-min.md | 55 ------------------- .../release-1.1.1-component-issues.md | 7 ++- .../release-1.3.0-component-issues.md | 7 ++- 3 files changed, 8 insertions(+), 61 deletions(-) delete mode 100644 .github/meta_issue_template/release-1.1.1-component-issues-min.md diff --git a/.github/meta_issue_template/release-1.1.1-component-issues-min.md b/.github/meta_issue_template/release-1.1.1-component-issues-min.md deleted file mode 100644 index fa6c68b087..0000000000 --- a/.github/meta_issue_template/release-1.1.1-component-issues-min.md +++ /dev/null @@ -1,55 +0,0 @@ -This is a component issue for release 1.1.1. -Coming from [release issue 1.1.1](https://github.com/opensearch-project/opensearch-build/issues/870), release version 1.1.1. Please follow the following checklist. - -
How to use this component issue -

- -## This Component Issue -This component issue captures the state of the OpenSearch release, on component/plugin level, its assignee is responsible for driving the release of the component. Please contact them or @mention them on this issue for help. - -## Release Steps -There are several steps to the release process, components that are behind present risk to the release. Component owners resolve tasks on this ticket to communicate with the overall release owner. - -Steps have completion dates for coordinating efforts between the components of a release; components can start as soon as they are ready far in advance of a future release. - -You can find all the corresponding dates of each step in the release issue above. - -

-
- - -### You can find all the date in above issue - -### Preparation - -- [ ] Assign this issue to a release owner. -- [ ] All the tasks in this issue have been reviewed by the release owner. -- [ ] Create, update, triage and label all features and issues targeted for this release with v1.1.1. - -### What should I do if my plugin isn't making any changes? -- [ ] If including changes in this release, increment the version on 1.1 branch to `1.1.1`, otherwise stay on `1.1.0`. - -### CI/CD - -- [ ] All code changes for 1.1.1 are complete. -- [ ] Ensure working and passing CI. - -### Pre-Release - -- [ ] Merge any changes to 1.1 you need for the patch -- [ ] Complete integration and sanity tests, and update results in the comment, [example](https://github.com/opensearch-project/opensearch-build/issues/1118). -- [ ] Find/fix bugs using latest tarball and docker image provided in meta issue. -- [ ] Completed release candidate testing build #TBD. -- [ ] All intermittent test failures have issues filed. - -### Release - -- [ ] Complete [documentation](https://github.com/opensearch-project/documentation-website). -- [ ] Gather, review and publish release notes. -- [ ] Verify all issued labeled for this release are closed or labelled for the next release. - -### Post Release - -- [ ] Create [a release tag](https://github.com/opensearch-project/.github/blob/main/RELEASING.md#tagging). -- [ ] Suggest improvements to [this template](https://github.com/opensearch-project/opensearch-build/blob/main/.github/ISSUE_TEMPLATE/release_template.md). -- [ ] Conduct a retrospect, and publish its results. diff --git a/.github/meta_issue_template/release-1.1.1-component-issues.md b/.github/meta_issue_template/release-1.1.1-component-issues.md index 8fc025868a..252ab62476 100644 --- a/.github/meta_issue_template/release-1.1.1-component-issues.md +++ b/.github/meta_issue_template/release-1.1.1-component-issues.md @@ -14,6 +14,9 @@ Steps have completion dates for coordinating efforts between the components of a You can find all the corresponding dates of each step in the release issue above. +### What should I do if my plugin isn't making any changes? +If including changes in this release, increment the version on 1.1 branch to `1.1.1` for Min/Core, and `1.1.1.0` for components. Otherwise, keep the version number unchanged for both. +

@@ -26,8 +29,6 @@ You can find all the corresponding dates of each step in the release issue above - [ ] All the tasks in this issue have been reviewed by the release owner. - [ ] Create, update, triage and label all features and issues targeted for this release with v1.1.1. -### What should I do if my plugin isn't making any changes? -- [ ] If including changes in this release, increment the version on 1.1 branch to `1.1.1.0`, otherwise stay on `1.1.0.0`. ### CI/CD @@ -36,7 +37,7 @@ You can find all the corresponding dates of each step in the release issue above ### Pre-Release -- [ ] Merge any changes to 1.1 you need for the patch +- [ ] Confirm that all changes for 1.1.1 have been merged. - [ ] Complete integration and sanity tests, and update results in the comment, [example](https://github.com/opensearch-project/opensearch-build/issues/1118). - [ ] Find/fix bugs using latest tarball and docker image provided in meta issue. - [ ] Completed release candidate testing build #TBD. diff --git a/.github/meta_issue_template/release-1.3.0-component-issues.md b/.github/meta_issue_template/release-1.3.0-component-issues.md index 06f43edc6e..e7a2ddd4ec 100644 --- a/.github/meta_issue_template/release-1.3.0-component-issues.md +++ b/.github/meta_issue_template/release-1.3.0-component-issues.md @@ -14,6 +14,9 @@ Steps have completion dates for coordinating efforts between the components of a You can find all the corresponding dates of each step in the release issue above. +### What should I do if my plugin isn't making any changes? +If including changes in this release, increment the version on 1.1 branch to `1.1.1` for Min/Core, and `1.1.1.0` for components. Otherwise, keep the version number unchanged for both. +

@@ -27,8 +30,6 @@ You can find all the corresponding dates of each step in the release issue above - [ ] All the tasks in this issue have been reviewed by the release owner. - [ ] Create, update, triage and label all features and issues targeted for this release with v1.3.0. -### What should I do if my plugin isn't making any changes? -- [ ] If including changes in this release, increment the version on 1.3 branch to `1.3.0.0`, otherwise stay on `1.3.0.0`. ### CI/CD @@ -39,7 +40,7 @@ You can find all the corresponding dates of each step in the release issue above ### Pre-Release - [ ] Update your branch in the [opensearch-dashboards input manifest](https://github.com/opensearch-project/opensearch-build/blob/main/manifests/1.3.0/opensearch-dashboards-1.3.0.yml). -- [ ] Merge any changes to 1.3 you need for the patch +- [ ] Confirm that all changes for 1.1.1 have been merged. - [ ] Complete integration tests, and update results in the comment, [example](https://github.com/opensearch-project/opensearch-build/issues/1118). - [ ] Find/fix bugs using latest tarball and docker image provided in meta issue. - [ ] Completed release candidate testing build #TBD.