From 9964731e525cf42fc826ae55b650a41753ddee55 Mon Sep 17 00:00:00 2001 From: Sagar <99425694+sgup432@users.noreply.github.com> Date: Fri, 8 Apr 2022 13:35:48 -0700 Subject: [PATCH] Adding open access for a module to fix pa plugin jdk 17 issue (#1947) Signed-off-by: Sagar Upadhyaya Adding code block for maven plugin zips Signed-off-by: pgodithi Adding code block for maven plugin zips Signed-off-by: pgodithi zip maven publish Signed-off-by: pgodithi added zipsmaven dir check Signed-off-by: pgodithi Adding better gradle project dir Signed-off-by: pgodithi test maven snapshots Signed-off-by: pgodithi test maven snapshots Signed-off-by: pgodithi test maven snapshots Signed-off-by: pgodithi test maven snapshots Signed-off-by: pgodithi test maven snapshots Signed-off-by: pgodithi test maven snapshots Signed-off-by: pgodithi test snapshot build Signed-off-by: pgodithi test snapshot build Signed-off-by: pgodithi test snapshot build Signed-off-by: pgodithi test snapshot build Signed-off-by: pgodithi test snapshot build Signed-off-by: pgodithi test snapshot build Signed-off-by: pgodithi test snapshot build Signed-off-by: pgodithi Removing build script for PA (#1952) Signed-off-by: Sagar Upadhyaya update release issue with steps to update ansible and helm (#1942) * update release issue with steps to update ansible and helm Signed-off-by: Abhinav Gupta * updated test as sample PR Signed-off-by: Abhinav Gupta * adding periods Signed-off-by: Abhinav Gupta Fix the path for maven sign and staging job (#1954) * Fix the path for staging maven Signed-off-by: Zelin Hao * Add the distribution folder tar to the artifact path and update test Signed-off-by: Zelin Hao [OSD][2.0.0] use rc1 qualifier (#1949) Signed-off-by: Kawika Avilla install createrepo in docker image for RPM yum repo support (#1955) * install createrepo in docker image for RPM yum repo support Signed-off-by: Tianle Huang * fix Signed-off-by: Tianle Huang * update opensearch to use new image Signed-off-by: Tianle Huang Add systemd docker for rpm service test (#1958) * Add systemd based image for yum install testing and more Signed-off-by: Peter Zhu * More packages to add to the images Signed-off-by: Peter Zhu lower freq for build for 1.3.1 opensearch-dashboards (#1941) * lower freq for build for 1.3.1 opensearch-dashboards Signed-off-by: Abhinav Gupta * removed build for 1.2.x and 1.3.1 Signed-off-by: Abhinav Gupta test snapshot build Signed-off-by: pgodithi test snapshot build Signed-off-by: pgodithi test snapshot build Signed-off-by: pgodithi test snapshot build Signed-off-by: pgodithi test snapshot build Signed-off-by: pgodithi Added notifications-core and notifications to 2.0 and add integTest manifest (#1957) * Added notifications-core and notifications to 2.0. Signed-off-by: dblock * Remove scripts from opensearch-build. Signed-off-by: dblock * Remove dashboards notifications scripts to use the default one Signed-off-by: Peter Zhu * Remove CI checks for lack of gradlew. Signed-off-by: dblock * Fix the second subfolder location after core Signed-off-by: Peter Zhu * Add notifications related build scripts to build repo Signed-off-by: Peter Zhu * Tweak build scripts to correctly move the zips Signed-off-by: Peter Zhu Co-authored-by: Peter Zhu Make sure notifications is built correctly while passing ci checks (#1959) Signed-off-by: Peter Zhu test snapshot build Signed-off-by: pgodithi test snapshot build Signed-off-by: pgodithi test snapshot build Signed-off-by: pgodithi test snapshot build Signed-off-by: pgodithi --- .github/ISSUE_TEMPLATE/release_template.md | 2 + ...opensearch-dashboards.x64.arm64.dockerfile | 2 +- ...ld.centos7.opensearch.x64.arm64.dockerfile | 2 +- ....centos7.systemd-base.x64.arm64.dockerfile | 31 ++ jenkins/check-for-build.jenkinsfile | 6 +- .../maven-sign-release.jenkinsfile | 4 +- .../opensearch/distribution-build.jenkinsfile | 413 +----------------- manifests/1.3.0/opensearch-1.3.0.yml | 95 +--- manifests/2.0.0/opensearch-2.0.0-test.yml | 116 +++++ manifests/2.0.0/opensearch-2.0.0.yml | 16 +- .../2.0.0/opensearch-dashboards-2.0.0.yml | 2 +- manifests/2.1.0/opensearch-2.1.0.yml | 2 +- manifests/3.0.0/opensearch-3.0.0.yml | 2 +- .../build.sh | 12 +- scripts/components/notifications/build.sh | 24 +- .../notificationsDashboards/build.sh | 82 ---- scripts/default/opensearch/build.sh | 12 + .../tar/linux/opensearch-tar-install.sh | 1 + scripts/opensearch-onetime-setup.sh | 1 + .../opensearch/opensearch.rpm.spec | 1 + .../maven-sign-release.jenkinsfile.txt | 2 +- 21 files changed, 219 insertions(+), 609 deletions(-) create mode 100644 docker/ci/dockerfiles/test.centos7.systemd-base.x64.arm64.dockerfile create mode 100644 manifests/2.0.0/opensearch-2.0.0-test.yml rename scripts/components/{performance-analyzer => notifications-core}/build.sh (77%) mode change 100755 => 100644 mode change 100755 => 100644 scripts/components/notifications/build.sh delete mode 100755 scripts/components/notificationsDashboards/build.sh diff --git a/.github/ISSUE_TEMPLATE/release_template.md b/.github/ISSUE_TEMPLATE/release_template.md index 37801c077f..2cb98550fc 100644 --- a/.github/ISSUE_TEMPLATE/release_template.md +++ b/.github/ISSUE_TEMPLATE/release_template.md @@ -82,6 +82,8 @@ __REPLACE with OpenSearch wide initiatives to improve quality and consistency.__ - [ ] Create [release tags](https://github.com/opensearch-project/opensearch-build/blob/main/jenkins/release-tag/release-tag.jenkinsfile) for each component (Jenkins job name: release-tag-creation). - [ ] Replace refs in [manifests/{{ env.VERSION }}](/opensearch-project/opensearch-build/tree/main/manifests/{{ env.VERSION }}) with tags and remove checks. - [ ] Generate distribution release notes reviewed by PM team for opensearch-build repository. +- [ ] Increment version for Helm Charts [(sample PR)](https://github.com/opensearch-project/helm-charts/pull/246) for the `{{ env.VERSION }}` release. +- [ ] Increment version for Ansible Charts [(sample PR)](https://github.com/opensearch-project/ansible-playbook/pull/50) for the `{{ env.VERSION }}` release. - [ ] Prepare [for next patch release](https://github.com/opensearch-project/opensearch-plugins/blob/main/META.md#increment-a-version-in-every-plugin) by incrementing patch versions for each component. - [ ] Lower the [frequency of builds](https://github.com/opensearch-project/opensearch-build/pull/1475) for this version of OpenSearch and/or OpenSearch Dashboards. - [ ] Update [this template](https://github.com/opensearch-project/opensearch-build/blob/main/.github/ISSUE_TEMPLATE/release_template.md) with any new or missed steps. diff --git a/docker/ci/dockerfiles/build.centos7.opensearch-dashboards.x64.arm64.dockerfile b/docker/ci/dockerfiles/build.centos7.opensearch-dashboards.x64.arm64.dockerfile index f390724e3f..4a7a5381ff 100644 --- a/docker/ci/dockerfiles/build.centos7.opensearch-dashboards.x64.arm64.dockerfile +++ b/docker/ci/dockerfiles/build.centos7.opensearch-dashboards.x64.arm64.dockerfile @@ -105,7 +105,7 @@ SHELL ["/bin/bash", "-lc"] CMD ["/bin/bash", "-l"] # Install ruby / rpm / fpm related dependencies -RUN . /etc/profile.d/rvm.sh && rvm install 2.4.0 && rvm --default use 2.4.0 && yum install -y rpm-build && yum clean all +RUN . /etc/profile.d/rvm.sh && rvm install 2.4.0 && rvm --default use 2.4.0 && yum install -y rpm-build createrepo && yum clean all ENV RUBY_HOME=/usr/local/rvm/rubies/ruby-2.4.0/bin ENV RVM_HOME=/usr/local/rvm/bin diff --git a/docker/ci/dockerfiles/build.centos7.opensearch.x64.arm64.dockerfile b/docker/ci/dockerfiles/build.centos7.opensearch.x64.arm64.dockerfile index c1e2e5684e..0c8c0a0dab 100644 --- a/docker/ci/dockerfiles/build.centos7.opensearch.x64.arm64.dockerfile +++ b/docker/ci/dockerfiles/build.centos7.opensearch.x64.arm64.dockerfile @@ -114,7 +114,7 @@ CMD ["/bin/bash", "-l"] # Install ruby / rpm / fpm related dependencies RUN . /etc/profile.d/rvm.sh && rvm install 2.4.0 && rvm --default use 2.4.0 && \ - yum install -y rpm-build && \ + yum install -y rpm-build createrepo && yum clean all && \ gem install fpm -v 1.13.0 ENV RUBY_HOME=/usr/local/rvm/rubies/ruby-2.4.0/bin diff --git a/docker/ci/dockerfiles/test.centos7.systemd-base.x64.arm64.dockerfile b/docker/ci/dockerfiles/test.centos7.systemd-base.x64.arm64.dockerfile new file mode 100644 index 0000000000..356c4381a8 --- /dev/null +++ b/docker/ci/dockerfiles/test.centos7.systemd-base.x64.arm64.dockerfile @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: Apache-2.0 +# +# The OpenSearch Contributors require contributions made to +# this file be licensed under the Apache-2.0 license or a +# compatible open source license. + +# This is a docker image specifically for setting up systemd env base for services with root user +# It is initially designed to test yum installation, but can be used for anything that requires systemd +# It used the method posted by Daniel Walsh: https://developers.redhat.com/blog/2014/05/05/running-systemd-within-docker-container + +# In order to run images with systemd, you need to run in privileged mode: `docker run --privileged -it -v /sys/fs/cgroup:/sys/fs/cgroup:ro ` + +FROM centos:7 + +ENV container docker + +RUN yum -y update && yum clean all + +# Possible retain of multi-user.target.wants later due to PA +# As of now we do not need this +RUN yum -y install systemd procps util-linux-ng openssl openssl-devel which curl git gnupg2 tar net-tools && yum clean all && \ +(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \ +rm -f /lib/systemd/system/multi-user.target.wants/*;\ +rm -f /etc/systemd/system/*.wants/*;\ +rm -f /lib/systemd/system/local-fs.target.wants/*; \ +rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ +rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ +rm -f /lib/systemd/system/basic.target.wants/*;\ +rm -f /lib/systemd/system/anaconda.target.wants/*; + +CMD ["/usr/sbin/init"] diff --git a/jenkins/check-for-build.jenkinsfile b/jenkins/check-for-build.jenkinsfile index bc13d05e96..0eb79da57f 100644 --- a/jenkins/check-for-build.jenkinsfile +++ b/jenkins/check-for-build.jenkinsfile @@ -9,13 +9,9 @@ pipeline { parameterizedCron ''' H/10 * * * * %INPUT_MANIFEST=3.0.0/opensearch-3.0.0.yml;TARGET_JOB_NAME=distribution-build-opensearch H/10 * * * * %INPUT_MANIFEST=1.3.2/opensearch-1.3.2.yml;TARGET_JOB_NAME=distribution-build-opensearch - H/10 * * * * %INPUT_MANIFEST=1.3.1/opensearch-dashboards-1.3.1.yml;TEST_MANIFEST=1.3.1/opensearch-dashboards-1.3.1-test.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards H/10 * * * * %INPUT_MANIFEST=1.2.5/opensearch-1.2.5.yml;TARGET_JOB_NAME=distribution-build-opensearch H/10 * * * * %INPUT_MANIFEST=2.0.0/opensearch-2.0.0.yml;TEST_MANIFEST=2.0.0/opensearch-2.0.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch H/10 * * * * %INPUT_MANIFEST=2.0.0/opensearch-dashboards-2.0.0.yml;TEST_MANIFEST=2.0.0/opensearch-dashboards-2.0.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards - H 1 * * * %INPUT_MANIFEST=1.2.1/opensearch-1.2.1.yml;TEST_MANIFEST=1.2.1/opensearch-1.2.1-test.yml;TARGET_JOB_NAME=distribution-build-opensearch - H 1 * * * %INPUT_MANIFEST=1.2.2/opensearch-1.2.2.yml;TEST_MANIFEST=1.2.2/opensearch-1.2.2-test.yml;TARGET_JOB_NAME=distribution-build-opensearch - H 1 * * * %INPUT_MANIFEST=1.2.3/opensearch-1.2.3.yml;TEST_MANIFEST=1.2.3/opensearch-1.2.3-test.yml;TARGET_JOB_NAME=distribution-build-opensearch H 1 * * * %INPUT_MANIFEST=2.1.0/opensearch-2.1.0.yml;TARGET_JOB_NAME=distribution-build-opensearch ''' } @@ -78,7 +74,7 @@ pipeline { string(name: 'INPUT_MANIFEST', value: "${INPUT_MANIFEST}"), string(name: 'TEST_MANIFEST', value: "${TEST_MANIFEST}") ], wait: true - + echo "Build succeeded, uploading build SHA for that job" buildUploadManifestSHA( inputManifest: "manifests/${INPUT_MANIFEST}", diff --git a/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile b/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile index e7e0e84077..cc189e65ca 100644 --- a/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile +++ b/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile @@ -21,7 +21,7 @@ pipeline { ) } environment { - ARTIFACT_PATH = "distribution-build-opensearch/${VERSION}/${BUILD_ID}/linux/x64/builds" + ARTIFACT_PATH = "distribution-build-opensearch/${VERSION}/${BUILD_ID}/linux/x64/tar/builds" } stages { stage('sign') { @@ -56,7 +56,7 @@ pipeline { script { // stage artifacts for release with Sonatype withCredentials([usernamePassword(credentialsId: 'Sonatype', usernameVariable: 'SONATYPE_USERNAME', passwordVariable: 'SONATYPE_PASSWORD')]) { - sh('$WORKSPACE/publish/stage-maven-release.sh $WORKSPACE/artifacts/$ARTIFACT_PATH/maven-signed') + sh('$WORKSPACE/publish/stage-maven-release.sh $WORKSPACE/artifacts/$ARTIFACT_PATH/opensearch/maven') } } } diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile index feb20d64ab..460918b48b 100644 --- a/jenkins/opensearch/distribution-build.jenkinsfile +++ b/jenkins/opensearch/distribution-build.jenkinsfile @@ -72,7 +72,7 @@ pipeline { } steps { script { - git url: 'https://github.com/opensearch-project/opensearch-build.git', branch: 'main' + git url: 'https://github.com/prudhvigodithi/opensearch-build.git', branch: 'zipsmaven' buildManifest( inputManifest: "manifests/${INPUT_MANIFEST}", distribution: 'tar', @@ -88,41 +88,6 @@ pipeline { } else { echo "Skipping publishing snapshots, ${mavenPath} does not exist." } - echo("Uploading min snapshots to S3") - uploadMinSnapshotsToS3( - fileActions: [createSha512Checksums()], - distribution: 'tar' - ) - } - } - post { - always { - postCleanup() - } - } - } - stage('build-snapshot-arm64-tar') { - agent { - docker { - label 'Jenkins-Agent-al2-arm64-c6g4xlarge-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( - inputManifest: "manifests/${INPUT_MANIFEST}", - distribution: 'tar', - snapshot: true - ) - echo("Uploading min snapshots to S3") - uploadMinSnapshotsToS3( - fileActions: [createSha512Checksums()], - distribution: 'tar' - ) } } post { @@ -131,380 +96,6 @@ pipeline { } } } - stage('build-and-test-x64-tar') { - agent { - docker { - label AGENT_X64 - image dockerAgent.image - args dockerAgent.args - alwaysPull true - } - } - steps { - script { - def buildManifestObj = buildAssembleUpload( - inputManifest: "manifests/${INPUT_MANIFEST}", - distribution: "tar" - ) - String buildManifestUrl = buildManifestObj.getUrl(JOB_NAME, BUILD_NUMBER) - String artifactUrl = buildManifestObj.getArtifactUrl(JOB_NAME, BUILD_NUMBER) - env.ARTIFACT_URL_X64_TAR = artifactUrl - env.INDEX_FILE_PATH = buildManifestObj.getIndexFileRoot("${JOB_NAME}") - - echo "buildManifestUrl (x64, tar): ${buildManifestUrl}" - echo "artifactUrl (x64, tar): ${artifactUrl}" - - parallel([ - 'integ-test': { - Boolean skipIntegTests = INTEG_TEST_JOB_NAME == '' - echo "${skipIntegTests ? 'Skipping integration tests' : 'Running integration tests'}" - if (!skipIntegTests) { - def integTestResults = - build job: INTEG_TEST_JOB_NAME, - propagate: false, - wait: true, - parameters: [ - string(name: 'TEST_MANIFEST', value: TEST_MANIFEST), - string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl), - string(name: 'AGENT_LABEL', value: AGENT_X64) - ] - - env.ARTIFACT_URL_X64_TAR_INTEG_TEST_RESULT = createTestResultsMessage( - testType: "Integ Tests (x64, tar)", - status: integTestResults.getResult(), - absoluteUrl: integTestResults.getAbsoluteUrl() - ) - } - }, - 'bwc-test': { - Boolean skipBwcTests = BWC_TEST_JOB_NAME == '' - echo "${skipBwcTests ? 'Skipping BWC tests' : 'Running BWC tests'}" - if (!skipBwcTests) { - def bwcTestResults = - build job: BWC_TEST_JOB_NAME, - propagate: false, - wait: true, - parameters: [ - string(name: 'TEST_MANIFEST', value: TEST_MANIFEST), - string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl), - string(name: 'AGENT_LABEL', value: AGENT_X64) - ] - - env.ARTIFACT_URL_X64_TAR_BWC_TEST_RESULT = createTestResultsMessage( - testType: "BWC Tests (x64, tar)", - status: bwcTestResults.getResult(), - absoluteUrl: bwcTestResults.getAbsoluteUrl() - ) - } - } - ]) - } - } - post { - always { - script { - lib.jenkins.Messages.new(this).add( - "${STAGE_NAME}", - lib.jenkins.Messages.new(this).get(["${STAGE_NAME}"]) + - "\n${env.ARTIFACT_URL_X64_TAR_INTEG_TEST_RESULT}" + - "\n${env.ARTIFACT_URL_X64_TAR_BWC_TEST_RESULT}" - ) - - postCleanup() - } - } - } - } - stage('build-and-test-x64-rpm') { - agent { - docker { - label AGENT_X64 - image dockerAgent.image - args dockerAgent.args - alwaysPull true - } - } - steps { - script { - def buildManifestObj = buildAssembleUpload( - inputManifest: "manifests/${INPUT_MANIFEST}", - distribution: "rpm" - ) - String buildManifestUrl = buildManifestObj.getUrl(JOB_NAME, BUILD_NUMBER) - String artifactUrl = buildManifestObj.getArtifactUrl(JOB_NAME, BUILD_NUMBER) - env.ARTIFACT_URL_X64_RPM = artifactUrl - - echo "buildManifestUrl (x64, rpm): ${buildManifestUrl}" - echo "artifactUrl (x64, rpm): ${artifactUrl}" - - parallel([ - 'integ-test': { - Boolean skipIntegTests = INTEG_TEST_JOB_NAME == '' - echo "${skipIntegTests ? 'Skipping integration tests' : 'Running integration tests'}" - if (!skipIntegTests) { - def integTestResults = - build job: INTEG_TEST_JOB_NAME, - propagate: false, - wait: true, - parameters: [ - string(name: 'TEST_MANIFEST', value: TEST_MANIFEST), - string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl), - string(name: 'AGENT_LABEL', value: AGENT_X64) - ] - - env.ARTIFACT_URL_X64_RPM_INTEG_TEST_RESULT = createTestResultsMessage( - testType: "Integ Tests (x64, rpm)", - status: integTestResults.getResult(), - absoluteUrl: integTestResults.getAbsoluteUrl() - ) - } - }, - 'bwc-test': { - Boolean skipBwcTests = BWC_TEST_JOB_NAME == '' - echo "${skipBwcTests ? 'Skipping BWC tests' : 'Running BWC tests'}" - if (!skipBwcTests) { - def bwcTestResults = - build job: BWC_TEST_JOB_NAME, - propagate: false, - wait: true, - parameters: [ - string(name: 'TEST_MANIFEST', value: TEST_MANIFEST), - string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl), - string(name: 'AGENT_LABEL', value: AGENT_X64) - ] - - env.ARTIFACT_URL_X64_RPM_BWC_TEST_RESULT = createTestResultsMessage( - testType: "BWC Tests (x64, rpm)", - status: bwcTestResults.getResult(), - absoluteUrl: bwcTestResults.getAbsoluteUrl() - ) - } - } - ]) - } - } - post { - always { - script { - lib.jenkins.Messages.new(this).add( - "${STAGE_NAME}", - lib.jenkins.Messages.new(this).get(["${STAGE_NAME}"]) + - "\n${env.ARTIFACT_URL_X64_RPM_INTEG_TEST_RESULT}" + - "\n${env.ARTIFACT_URL_X64_RPM_BWC_TEST_RESULT}" - ) - - postCleanup() - } - } - } - } - stage('build-and-test-arm64-tar') { - agent { - docker { - label AGENT_ARM64 - image dockerAgent.image - args dockerAgent.args - alwaysPull true - } - } - steps { - script { - def buildManifestObj = buildAssembleUpload( - inputManifest: "manifests/${INPUT_MANIFEST}", - distribution: "tar" - ) - String buildManifestUrl = buildManifestObj.getUrl(JOB_NAME, BUILD_NUMBER) - String artifactUrl = buildManifestObj.getArtifactUrl(JOB_NAME, BUILD_NUMBER) - env.ARTIFACT_URL_ARM64_TAR = artifactUrl - - echo "buildManifestUrl (arm64, tar): ${buildManifestUrl}" - echo "artifactUrl (arm64, tar): ${artifactUrl}" - - parallel([ - 'integ-test': { - Boolean skipIntegTests = INTEG_TEST_JOB_NAME == '' - echo "${skipIntegTests ? 'Skipping integration tests' : 'Running integration tests'}" - if (!skipIntegTests) { - def integTestResults = - build job: INTEG_TEST_JOB_NAME, - propagate: false, - wait: true, - parameters: [ - string(name: 'TEST_MANIFEST', value: TEST_MANIFEST), - string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl), - string(name: 'AGENT_LABEL', value: AGENT_ARM64) - ] - - env.ARTIFACT_URL_ARM64_TAR_INTEG_TEST_RESULT = createTestResultsMessage( - testType: "Integ Tests (arm64, tar)", - status: integTestResults.getResult(), - absoluteUrl: integTestResults.getAbsoluteUrl() - ) - } - }, - 'bwc-test': { - Boolean skipBwcTests = BWC_TEST_JOB_NAME == '' - echo "${skipBwcTests ? 'Skipping BWC tests' : 'Running BWC tests'}" - if (!skipBwcTests) { - def bwcTestResults = - build job: BWC_TEST_JOB_NAME, - propagate: false, - wait: true, - parameters: [ - string(name: 'TEST_MANIFEST', value: TEST_MANIFEST), - string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl), - string(name: 'AGENT_LABEL', value: AGENT_ARM64) - ] - - env.ARTIFACT_URL_ARM64_TAR_BWC_TEST_RESULT = createTestResultsMessage( - testType: "BWC Tests (arm64, tar)", - status: bwcTestResults.getResult(), - absoluteUrl: bwcTestResults.getAbsoluteUrl() - ) - } - } - ]) - } - } - post { - always { - script { - lib.jenkins.Messages.new(this).add( - "${STAGE_NAME}", - lib.jenkins.Messages.new(this).get(["${STAGE_NAME}"]) + - "\n${env.ARTIFACT_URL_ARM64_TAR_INTEG_TEST_RESULT}" + - "\n${env.ARTIFACT_URL_ARM64_TAR_BWC_TEST_RESULT}" - ) - - postCleanup() - } - } - } - } - stage('build-and-test-arm64-rpm') { - agent { - docker { - label AGENT_ARM64 - image dockerAgent.image - args dockerAgent.args - alwaysPull true - } - } - steps { - script { - def buildManifestObj = buildAssembleUpload( - inputManifest: "manifests/${INPUT_MANIFEST}", - distribution: "rpm" - ) - String buildManifestUrl = buildManifestObj.getUrl(JOB_NAME, BUILD_NUMBER) - String artifactUrl = buildManifestObj.getArtifactUrl(JOB_NAME, BUILD_NUMBER) - env.ARTIFACT_URL_ARM64_RPM = artifactUrl - - echo "buildManifestUrl (arm64, rpm): ${buildManifestUrl}" - echo "artifactUrl (arm64, rpm): ${artifactUrl}" - - parallel([ - 'integ-test': { - Boolean skipIntegTests = INTEG_TEST_JOB_NAME == '' - echo "${skipIntegTests ? 'Skipping integration tests' : 'Running integration tests'}" - if (!skipIntegTests) { - def integTestResults = - build job: INTEG_TEST_JOB_NAME, - propagate: false, - wait: true, - parameters: [ - string(name: 'TEST_MANIFEST', value: TEST_MANIFEST), - string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl), - string(name: 'AGENT_LABEL', value: AGENT_ARM64) - ] - - env.ARTIFACT_URL_ARM64_RPM_INTEG_TEST_RESULT = createTestResultsMessage( - testType: "Integ Tests (arm64, rpm)", - status: integTestResults.getResult(), - absoluteUrl: integTestResults.getAbsoluteUrl() - ) - } - }, - 'bwc-test': { - Boolean skipBwcTests = BWC_TEST_JOB_NAME == '' - echo "${skipBwcTests ? 'Skipping BWC tests' : 'Running BWC tests'}" - if (!skipBwcTests) { - def bwcTestResults = - build job: BWC_TEST_JOB_NAME, - propagate: false, - wait: true, - parameters: [ - string(name: 'TEST_MANIFEST', value: TEST_MANIFEST), - string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl), - string(name: 'AGENT_LABEL', value: AGENT_ARM64) - ] - - env.ARTIFACT_URL_ARM64_RPM_BWC_TEST_RESULT = createTestResultsMessage( - testType: "BWC Tests (arm64, rpm)", - status: bwcTestResults.getResult(), - absoluteUrl: bwcTestResults.getAbsoluteUrl() - ) - - } - } - ]) - } - } - post { - always { - script { - lib.jenkins.Messages.new(this).add( - "${STAGE_NAME}", - lib.jenkins.Messages.new(this).get(["${STAGE_NAME}"]) + - "\n${env.ARTIFACT_URL_ARM64_RPM_INTEG_TEST_RESULT}" + - "\n${env.ARTIFACT_URL_ARM64_RPM_BWC_TEST_RESULT}" - ) - - postCleanup() - } - } - } - } - } - } - stage('update index file') { - agent { - docker { - label AGENT_X64 - image dockerAgent.image - args dockerAgent.args - alwaysPull true - } - } - steps { - script { - uploadIndexFile( - indexFilePath: env.INDEX_FILE_PATH - ) - } - } - } - stage('docker build') { - when { - beforeAgent true - expression { - return params.BUILD_DOCKER - } - } - steps { - node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { - script { - - echo "env.ARTIFACT_URL_X64_TAR: ${env.ARTIFACT_URL_X64_TAR}" - echo "env.ARTIFACT_URL_ARM64_TAR: ${env.ARTIFACT_URL_ARM64_TAR}" - - buildDockerImage( - inputManifest: "manifests/${INPUT_MANIFEST}", - artifactUrlX64: env.ARTIFACT_URL_X64_TAR, - artifactUrlArm64: env.ARTIFACT_URL_ARM64_TAR - ) - } - } } } } @@ -550,4 +141,4 @@ pipeline { } } } -} +} \ No newline at end of file diff --git a/manifests/1.3.0/opensearch-1.3.0.yml b/manifests/1.3.0/opensearch-1.3.0.yml index 36a843cdf6..c7b80918db 100644 --- a/manifests/1.3.0/opensearch-1.3.0.yml +++ b/manifests/1.3.0/opensearch-1.3.0.yml @@ -14,92 +14,15 @@ components: checks: - gradle:publish - gradle:properties:version - - name: common-utils - repository: https://github.com/opensearch-project/common-utils.git - ref: tags/1.3.0.0 - checks: - - gradle:publish - - gradle:properties:version + #- name: common-utils + # repository: https://github.com/opensearch-project/common-utils.git + # ref: tags/1.3.0.0 + # checks: + # - gradle:publish + # - gradle:properties:version - name: job-scheduler - repository: https://github.com/opensearch-project/job-scheduler.git - ref: tags/1.3.0.0 - checks: - - gradle:properties:version - - gradle:dependencies:opensearch.version - - name: ml-commons - repository: https://github.com/opensearch-project/ml-commons.git - ref: tags/1.3.0.0 - checks: - - gradle:properties:version - - gradle:dependencies:opensearch.version: opensearch-ml-plugin - - name: alerting - repository: https://github.com/opensearch-project/alerting.git - ref: tags/1.3.0.0 - checks: - - gradle:properties:version - - gradle:dependencies:opensearch.version: alerting - - name: asynchronous-search - repository: https://github.com/opensearch-project/asynchronous-search.git - ref: tags/1.3.0.0 - checks: - - gradle:properties:version - - gradle:dependencies:opensearch.version - - name: index-management - repository: https://github.com/opensearch-project/index-management.git - ref: tags/1.3.0.0 - checks: - - gradle:properties:version - - gradle:dependencies:opensearch.version - - name: k-NN - repository: https://github.com/opensearch-project/k-NN.git - ref: tags/1.3.0.0 - platforms: - - darwin - - linux - checks: - - gradle:properties:version - - gradle:dependencies:opensearch.version - - name: security - repository: https://github.com/opensearch-project/security.git - ref: tags/1.3.0.0 - - name: performance-analyzer - repository: https://github.com/opensearch-project/performance-analyzer.git - ref: tags/1.3.0.0 - checks: - - gradle:properties:version - - gradle:dependencies:opensearch.version - platforms: - - darwin - - linux - - name: anomaly-detection - repository: https://github.com/opensearch-project/anomaly-detection.git - ref: tags/1.3.0.0 - checks: - - gradle:properties:version - - gradle:dependencies:opensearch.version - - name: cross-cluster-replication - repository: https://github.com/opensearch-project/cross-cluster-replication.git - ref: tags/1.3.0.0 - checks: - - gradle:properties:version - - gradle:dependencies:opensearch.version - - name: sql - repository: https://github.com/opensearch-project/sql.git - ref: tags/1.3.0.0 - checks: - - gradle:properties:version - - gradle:dependencies:opensearch.version: plugin - - name: dashboards-reports - repository: https://github.com/opensearch-project/dashboards-reports.git - ref: tags/1.3.0.0 - working_directory: reports-scheduler - checks: - - gradle:properties:version - - gradle:dependencies:opensearch.version - - name: opensearch-observability - repository: https://github.com/opensearch-project/observability - ref: tags/1.3.0.0 - working_directory: opensearch-observability + repository: https://github.com/prudhvigodithi/job-scheduler.git + ref: '1.3' checks: - gradle:properties:version - - gradle:dependencies:opensearch.version + - gradle:dependencies:opensearch.version \ No newline at end of file diff --git a/manifests/2.0.0/opensearch-2.0.0-test.yml b/manifests/2.0.0/opensearch-2.0.0-test.yml new file mode 100644 index 0000000000..e0955e50f4 --- /dev/null +++ b/manifests/2.0.0/opensearch-2.0.0-test.yml @@ -0,0 +1,116 @@ +--- +schema-version: '1.0' +name: OpenSearch +ci: + image: + name: opensearchstaging/ci-runner-centos7-opensearch-build-v1 + args: -e JAVA_HOME=/opt/java/openjdk-17 +components: + - name: index-management + integ-test: + build-dependencies: + - job-scheduler + test-configs: + - with-security + - without-security + additional-cluster-configs: + path.repo: [/tmp] + bwc-test: + test-configs: + - with-security + - without-security + + - name: anomaly-detection + integ-test: + build-dependencies: + - job-scheduler + test-configs: + - with-security + - without-security + bwc-test: + test-configs: + - with-security + - without-security + + - name: asynchronous-search + integ-test: + test-configs: + - with-security + - without-security + bwc-test: + test-configs: + - with-security + - without-security + + - name: alerting + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + plugins.destination.host.deny_list: [10.0.0.0/8, 127.0.0.1] + bwc-test: + test-configs: + - with-security + - without-security + + - name: notifications + working-directory: notifications + integ-test: + test-configs: + - with-security + - without-security + bwc-test: + test-configs: + - with-security + - without-security + + - name: sql + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + script.context.field.max_compilations_rate: 1000/1m + bwc-test: + test-configs: + - with-security + - without-security + + - name: k-NN + integ-test: + test-configs: + - with-security + - without-security + bwc-test: + test-configs: + - with-security + - without-security + + - name: dashboards-reports + working-directory: reports-scheduler + integ-test: + test-configs: + - without-security + bwc-test: + test-configs: + - without-security + + - name: observability + working-directory: opensearch-observability + integ-test: + test-configs: + - without-security + bwc-test: + test-configs: + - without-security + + - name: ml-commons + integ-test: + test-configs: + - with-security + - without-security + bwc-test: + test-configs: + - with-security + - without-security diff --git a/manifests/2.0.0/opensearch-2.0.0.yml b/manifests/2.0.0/opensearch-2.0.0.yml index bec63f88b8..e9c5895bbb 100644 --- a/manifests/2.0.0/opensearch-2.0.0.yml +++ b/manifests/2.0.0/opensearch-2.0.0.yml @@ -2,7 +2,7 @@ schema-version: '1.0' ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-v1 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v1 args: -e JAVA_HOME=/opt/java/openjdk-17 build: name: OpenSearch @@ -42,6 +42,20 @@ components: checks: - gradle:properties:version - gradle:dependencies:opensearch.version + - name: notifications-core + repository: https://github.com/opensearch-project/notifications.git + ref: main + working_directory: notifications + checks: + - gradle:properties:version + - gradle:dependencies:opensearch.version: opensearch-notifications-core + - name: notifications + repository: https://github.com/opensearch-project/notifications.git + ref: main + working_directory: notifications + checks: + - gradle:properties:version + - gradle:dependencies:opensearch.version: notifications - name: alerting repository: https://github.com/opensearch-project/alerting.git ref: main diff --git a/manifests/2.0.0/opensearch-dashboards-2.0.0.yml b/manifests/2.0.0/opensearch-dashboards-2.0.0.yml index 0efd922d97..b555fd59e9 100644 --- a/manifests/2.0.0/opensearch-dashboards-2.0.0.yml +++ b/manifests/2.0.0/opensearch-dashboards-2.0.0.yml @@ -3,7 +3,7 @@ schema-version: '1.0' build: name: OpenSearch Dashboards version: 2.0.0 - qualifier: alpha1 + qualifier: rc1 ci: image: name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v1 diff --git a/manifests/2.1.0/opensearch-2.1.0.yml b/manifests/2.1.0/opensearch-2.1.0.yml index 242a75381d..6dab97b0aa 100644 --- a/manifests/2.1.0/opensearch-2.1.0.yml +++ b/manifests/2.1.0/opensearch-2.1.0.yml @@ -5,7 +5,7 @@ build: version: 2.1.0 ci: image: - name: opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v1 components: - name: OpenSearch repository: https://github.com/opensearch-project/OpenSearch.git diff --git a/manifests/3.0.0/opensearch-3.0.0.yml b/manifests/3.0.0/opensearch-3.0.0.yml index d021e3008d..8520a5f1be 100644 --- a/manifests/3.0.0/opensearch-3.0.0.yml +++ b/manifests/3.0.0/opensearch-3.0.0.yml @@ -5,7 +5,7 @@ build: version: 3.0.0 ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-v1 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v1 components: - name: OpenSearch repository: https://github.com/opensearch-project/OpenSearch.git diff --git a/scripts/components/performance-analyzer/build.sh b/scripts/components/notifications-core/build.sh old mode 100755 new mode 100644 similarity index 77% rename from scripts/components/performance-analyzer/build.sh rename to scripts/components/notifications-core/build.sh index 92fb1d6e0e..95cc23128b --- a/scripts/components/performance-analyzer/build.sh +++ b/scripts/components/notifications-core/build.sh @@ -13,8 +13,8 @@ function usage() { echo "" echo "Arguments:" echo -e "-v VERSION\t[Required] OpenSearch version." - echo -e "-s SNAPSHOT\t[Optional] Build a snapshot, default is 'false'." echo -e "-q QUALIFIER\t[Optional] Build qualifier." + echo -e "-s SNAPSHOT\t[Optional] Build a snapshot, default is 'false'." echo -e "-p PLATFORM\t[Optional] Platform, ignored." echo -e "-a ARCHITECTURE\t[Optional] Build architecture, ignored." echo -e "-o OUTPUT\t[Optional] Output path, default is 'artifacts'." @@ -67,6 +67,10 @@ fi [[ "$SNAPSHOT" == "true" ]] && VERSION=$VERSION-SNAPSHOT [ -z "$OUTPUT" ] && OUTPUT=artifacts -./gradlew build -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER -x test -mkdir -p $OUTPUT/plugins -cp ./build/distributions/*.zip $OUTPUT/plugins + +./gradlew publishToMavenLocal -PexcludeTests="**/SesChannelIT*" -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER +./gradlew assemble --no-daemon --refresh-dependencies -DskipTests=true -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER + +mkdir -p ./$OUTPUT/plugins +notifCoreZipPath=$(ls core/build/distributions/ | grep .zip) +cp -v core/build/distributions/$notifCoreZipPath ./$OUTPUT/plugins diff --git a/scripts/components/notifications/build.sh b/scripts/components/notifications/build.sh old mode 100755 new mode 100644 index 1749a768aa..5ddaf06657 --- a/scripts/components/notifications/build.sh +++ b/scripts/components/notifications/build.sh @@ -13,6 +13,7 @@ function usage() { echo "" echo "Arguments:" echo -e "-v VERSION\t[Required] OpenSearch version." + echo -e "-q QUALIFIER\t[Optional] Build qualifier." echo -e "-s SNAPSHOT\t[Optional] Build a snapshot, default is 'false'." echo -e "-p PLATFORM\t[Optional] Platform, ignored." echo -e "-a ARCHITECTURE\t[Optional] Build architecture, ignored." @@ -20,7 +21,7 @@ function usage() { echo -e "-h help" } -while getopts ":h:v:s:o:p:a:" arg; do +while getopts ":h:v:q:s:o:p:a:" arg; do case $arg in h) usage @@ -29,6 +30,9 @@ while getopts ":h:v:s:o:p:a:" arg; do v) VERSION=$OPTARG ;; + q) + QUALIFIER=$OPTARG + ;; s) SNAPSHOT=$OPTARG ;; @@ -59,19 +63,15 @@ if [ -z "$VERSION" ]; then exit 1 fi +[[ ! -z "$QUALIFIER" ]] && VERSION=$VERSION-$QUALIFIER [[ "$SNAPSHOT" == "true" ]] && VERSION=$VERSION-SNAPSHOT [ -z "$OUTPUT" ] && OUTPUT=artifacts -mkdir -p $OUTPUT/maven -mkdir -p $OUTPUT/plugins +./gradlew publishToMavenLocal -PexcludeTests="**/SesChannelIT*" -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER +./gradlew assemble --no-daemon --refresh-dependencies -DskipTests=true -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER + +mkdir -p ./$OUTPUT/plugins -cd notifications -./gradlew publishToMavenLocal -PexcludeTests="**/SesChannelIT*" -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -./gradlew assemble --no-daemon --refresh-dependencies -DskipTests=true -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -cd .. +notifCoreZipPath=$(ls notifications/build/distributions/ | grep .zip) +cp -v notifications/build/distributions/$notifCoreZipPath ./$OUTPUT/plugins -zipPath=$(find . -path \*notifications/build/distributions/*.zip) -distributions="$(dirname "${zipPath}")" -echo "COPY ${distributions}/*.zip" -mkdir -p $OUTPUT/plugins -cp ${distributions}/*.zip ./$OUTPUT/plugins \ No newline at end of file diff --git a/scripts/components/notificationsDashboards/build.sh b/scripts/components/notificationsDashboards/build.sh deleted file mode 100755 index fe2046e603..0000000000 --- a/scripts/components/notificationsDashboards/build.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash - -# SPDX-License-Identifier: Apache-2.0 -# -# The OpenSearch Contributors require contributions made to -# this file be licensed under the Apache-2.0 license or a -# compatible open source license. - -set -ex - -function usage() { - echo "Usage: $0 [args]" - echo "" - echo "Arguments:" - echo -e "-v VERSION\t[Required] OpenSearch version." - echo -e "-q QUALIFIER\t[Optional] Version qualifier." - echo -e "-s SNAPSHOT\t[Optional] Build a snapshot, default is 'false'." - echo -e "-p PLATFORM\t[Optional] Platform, ignored." - echo -e "-a ARCHITECTURE\t[Optional] Build architecture, ignored." - echo -e "-o OUTPUT\t[Optional] Output path, default is 'artifacts'." - echo -e "-h help" -} - -while getopts ":h:v:q:s:o:p:a:" arg; do - case $arg in - h) - usage - exit 1 - ;; - v) - VERSION=$OPTARG - ;; - q) - QUALIFIER=$OPTARG - ;; - s) - SNAPSHOT=$OPTARG - ;; - o) - OUTPUT=$OPTARG - ;; - p) - PLATFORM=$OPTARG - ;; - a) - ARCHITECTURE=$OPTARG - ;; - :) - echo "Error: -${OPTARG} requires an argument" - usage - exit 1 - ;; - ?) - echo "Invalid option: -${arg}" - exit 1 - ;; - esac -done - -if [ -z "$VERSION" ]; then - echo "Error: You must specify the OpenSearch Dashboards version" - usage - exit 1 -fi - -[ -z "$OUTPUT" ] && OUTPUT=artifacts -[ ! -z "$QUALIFIER" ] && QUALIFIER_IDENTIFIER="-$QUALIFIER" - -mkdir -p $OUTPUT/plugins -# For hybrid plugin it actually resides in 'notificationsDashboards/dashboards-notifications' -PLUGIN_FOLDER=$(basename "$PWD") -PLUGIN_NAME=$(basename $(dirname "$PWD")) -# TODO: [CLEANUP] Needed OpenSearch Dashboards git repo to build the required modules for plugins -# This makes it so there is a dependency on having Dashboards pulled already. -cp -r ../$PLUGIN_FOLDER/ ../../OpenSearch-Dashboards/plugins -echo "BUILD MODULES FOR $PLUGIN_NAME" -(cd ../../OpenSearch-Dashboards && source $NVM_DIR/nvm.sh && nvm use && yarn osd bootstrap) -echo "BUILD RELEASE ZIP FOR $PLUGIN_NAME" -(cd ../../OpenSearch-Dashboards && source $NVM_DIR/nvm.sh && nvm use && cd plugins/$PLUGIN_FOLDER && yarn plugin_helpers build --opensearch-dashboards-version=$VERSION$QUALIFIER_IDENTIFIER) -echo "COPY $PLUGIN_NAME.zip" -cp -r ../../OpenSearch-Dashboards/plugins/$PLUGIN_FOLDER/build/$PLUGIN_NAME-$VERSION$QUALIFIER_IDENTIFIER.zip $OUTPUT/plugins/ -rm -rf ../../OpenSearch-Dashboards/plugins/$PLUGIN_FOLDER \ No newline at end of file diff --git a/scripts/default/opensearch/build.sh b/scripts/default/opensearch/build.sh index 5cf8540650..7fe011cca9 100755 --- a/scripts/default/opensearch/build.sh +++ b/scripts/default/opensearch/build.sh @@ -77,3 +77,15 @@ distributions="$(dirname "${zipPath}")" echo "COPY ${distributions}/*.zip" mkdir -p $OUTPUT/plugins cp ${distributions}/*.zip ./$OUTPUT/plugins + +##Following code checks for zipsmaven dir and if printZipsPublishProperty disabled, to publish plugin zips to maven repo +publishZip=$(./gradlew -q printZipsPublishProperty) +ZipDIR="maven/plugin-zips" +if [ -d $ZipDIR ] && [ $publishZip != 'skip' ]; then + echo "Copying the Maven plugin Zips" + mkdir -p $OUTPUT/maven/org/opensearch/plugin + ./gradlew publishMavenPublicationToMavenLocal -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER + ./gradlew publishMavenPublicationToStagingRepository -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER + mkdir -p $OUTPUT/maven/org/opensearch + cp -r ./build/local-staging-repo/org/opensearch/plugin/. $OUTPUT/maven/org/opensearch/plugin +fi diff --git a/scripts/legacy/tar/linux/opensearch-tar-install.sh b/scripts/legacy/tar/linux/opensearch-tar-install.sh index 07da0d933b..a1f19eb812 100755 --- a/scripts/legacy/tar/linux/opensearch-tar-install.sh +++ b/scripts/legacy/tar/linux/opensearch-tar-install.sh @@ -27,6 +27,7 @@ if ! grep -q '## OpenSearch Performance Analyzer' $OPENSEARCH_HOME/config/jvm.op echo "-Dclk.tck=$CLK_TCK" >> $OPENSEARCH_HOME/config/jvm.options echo "-Djdk.attach.allowAttachSelf=true" >> $OPENSEARCH_HOME/config/jvm.options echo "-Djava.security.policy=$OPENSEARCH_HOME/plugins/opensearch-performance-analyzer/pa_config/opensearch_security.policy" >> $OPENSEARCH_HOME/config/jvm.options + echo "--add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED" >> $OPENSEARCH_HOME/config/jvm.options fi echo "done plugins" diff --git a/scripts/opensearch-onetime-setup.sh b/scripts/opensearch-onetime-setup.sh index c2c62e5eae..c275c851eb 100755 --- a/scripts/opensearch-onetime-setup.sh +++ b/scripts/opensearch-onetime-setup.sh @@ -46,5 +46,6 @@ if ! grep -q '## OpenDistro Performance Analyzer' $OPENSEARCH_HOME/config/jvm.op echo "-Dclk.tck=$CLK_TCK" >> $OPENSEARCH_HOME/config/jvm.options echo "-Djdk.attach.allowAttachSelf=true" >> $OPENSEARCH_HOME/config/jvm.options echo "-Djava.security.policy=$OPENSEARCH_HOME/plugins/$PA_PLUGIN/pa_config/opensearch_security.policy" >> $OPENSEARCH_HOME/config/jvm.options + echo "--add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED" >> $OPENSEARCH_HOME/config/jvm.options fi diff --git a/scripts/pkg/build_templates/opensearch/opensearch.rpm.spec b/scripts/pkg/build_templates/opensearch/opensearch.rpm.spec index 1bb5209282..3065d250cd 100644 --- a/scripts/pkg/build_templates/opensearch/opensearch.rpm.spec +++ b/scripts/pkg/build_templates/opensearch/opensearch.rpm.spec @@ -94,6 +94,7 @@ if ! grep -q '## OpenSearch Performance Analyzer' %{config_dir}/jvm.options; the echo "-Dclk.tck=$CLK_TCK" >> %{config_dir}/jvm.options echo "-Djdk.attach.allowAttachSelf=true" >> %{config_dir}/jvm.options echo "-Djava.security.policy=file:///usr/share/opensearch/plugins/opensearch-performance-analyzer/pa_config/opensearch_security.policy" >> %{config_dir}/jvm.options + echo "--add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED" >> %{config_dir}/jvm.options fi # Reload systemctl daemon if command -v systemctl > /dev/null; then diff --git a/tests/jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt index 52ebddcbba..21ff0fa634 100644 --- a/tests/jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt @@ -30,7 +30,7 @@ maven-sign-release.script(groovy.lang.Closure) maven-sign-release.usernamePassword({credentialsId=Sonatype, usernameVariable=SONATYPE_USERNAME, passwordVariable=SONATYPE_PASSWORD}) maven-sign-release.withCredentials([[SONATYPE_USERNAME, SONATYPE_PASSWORD]], groovy.lang.Closure) - maven-sign-release.sh($WORKSPACE/publish/stage-maven-release.sh $WORKSPACE/artifacts/$ARTIFACT_PATH/maven-signed) + maven-sign-release.sh($WORKSPACE/publish/stage-maven-release.sh $WORKSPACE/artifacts/$ARTIFACT_PATH/opensearch/maven) maven-sign-release.script(groovy.lang.Closure) maven-sign-release.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})