diff --git a/jenkins/check-for-build.jenkinsfile b/jenkins/check-for-build.jenkinsfile index 60d258062c..46a432d1b9 100644 --- a/jenkins/check-for-build.jenkinsfile +++ b/jenkins/check-for-build.jenkinsfile @@ -11,6 +11,7 @@ pipeline { } triggers { parameterizedCron ''' + H 1 * * * %INPUT_MANIFEST=2.4.0/opensearch-dashboards-2.4.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards H 1 * * * %INPUT_MANIFEST=2.4.0/opensearch-2.4.0.yml;TARGET_JOB_NAME=distribution-build-opensearch H 1 * * * %INPUT_MANIFEST=1.3.6/opensearch-1.3.6.yml;TARGET_JOB_NAME=distribution-build-opensearch H 1 * * * %INPUT_MANIFEST=3.0.0/opensearch-3.0.0.yml;TARGET_JOB_NAME=distribution-build-opensearch diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile index d09c4461c0..90dd217edb 100644 --- a/jenkins/opensearch-dashboards/integ-test.jenkinsfile +++ b/jenkins/opensearch-dashboards/integ-test.jenkinsfile @@ -17,7 +17,7 @@ pipeline { ) string( name: 'BUILD_MANIFEST_URL', - description: 'The build manifest URL, e.g. https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.0.0/98/linux/x64/builds/opensearch-dashboards/manifest.yml.', + description: 'The build manifest URL, e.g. https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.0.0/98/linux/x64/tar/builds/opensearch-dashboards/manifest.yml', trim: true ) string( diff --git a/jenkins/opensearch/perf-test.jenkinsfile b/jenkins/opensearch/perf-test.jenkinsfile index b81a71304d..d507b07908 100644 --- a/jenkins/opensearch/perf-test.jenkinsfile +++ b/jenkins/opensearch/perf-test.jenkinsfile @@ -26,7 +26,7 @@ pipeline { parameters { string( name: 'BUNDLE_MANIFEST_URL', - description: 'The bundle manifest URL, e.g. https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.2.2/98/linux/x64/builds/opensearch/manifest.yml.', + description: 'The distribution manifest URL, e.g. https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.3.0/6039/linux/x64/tar/dist/opensearch/manifest.yml', trim: true ) string( diff --git a/manifests/2.4.0/opensearch-dashboards-2.4.0.yml b/manifests/2.4.0/opensearch-dashboards-2.4.0.yml new file mode 100644 index 0000000000..a7aff55968 --- /dev/null +++ b/manifests/2.4.0/opensearch-dashboards-2.4.0.yml @@ -0,0 +1,12 @@ +--- +schema-version: '1.0' +build: + name: OpenSearch Dashboards + version: 2.4.0 +ci: + image: + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2 +components: + - name: OpenSearch-Dashboards + repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git + ref: 2.x diff --git a/src/manifests_workflow/input_manifests.py b/src/manifests_workflow/input_manifests.py index c2152a8f8f..bd950c2fbb 100644 --- a/src/manifests_workflow/input_manifests.py +++ b/src/manifests_workflow/input_manifests.py @@ -173,11 +173,11 @@ def add_to_cron(self, version: str) -> None: logging.info(f"Wrote {jenkinsfile}") def add_to_versionincrement_workflow(self, version: str) -> None: - logging.info("Adding new version the version increment workflow") + logging.info("Adding new version to the version increment workflow") versionincrement_workflow_file = self.versionincrement_workflow() yaml = ruamel.yaml.YAML() - yaml.explicit_start = True - yaml.preserve_quotes = True + yaml.explicit_start = True # type: ignore + yaml.preserve_quotes = True # type: ignore with open(versionincrement_workflow_file) as f: data = yaml.load(f) @@ -195,4 +195,4 @@ def add_to_versionincrement_workflow(self, version: str) -> None: with open(versionincrement_workflow_file, 'w') as f: yaml.dump(data, f) - logging.info("Added new version the version increment workflow") + logging.info("Added new version to the version increment workflow")