From 42344f07e658dfbff31a4ead34486202d9a923bf Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 11 Oct 2022 19:40:28 +0000 Subject: [PATCH 1/3] Test Again Signed-off-by: Peter Zhu --- scripts/components/security/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/components/security/install.sh b/scripts/components/security/install.sh index 2c9e1c18a1..97c6b5093d 100755 --- a/scripts/components/security/install.sh +++ b/scripts/components/security/install.sh @@ -72,6 +72,7 @@ fi [ -z "$ARCHITECTURE" ] && ARCHITECTURE=`uname -m` SECURITY_PLUGIN="opensearch-security" +ls -l $OUTPUT/plugins/$SECURITY_PLUGIN/tools chmod -c 755 $OUTPUT/plugins/$SECURITY_PLUGIN/tools/*.sh if [ "$PLATFORM" = "windows" ]; then From f211bece9ac452497d7c9c3185003ba4a34893bd Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 11 Oct 2022 21:13:35 +0000 Subject: [PATCH 2/3] Test 1.0.2 lib Signed-off-by: Peter Zhu --- jenkins/opensearch/distribution-build.jenkinsfile | 2 +- jenkins/promotion/promote-artifacts.jenkinsfile | 2 +- scripts/components/security/install.sh | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile index da677ddb0b..de29cc94ab 100644 --- a/jenkins/opensearch/distribution-build.jenkinsfile +++ b/jenkins/opensearch/distribution-build.jenkinsfile @@ -1,4 +1,4 @@ -lib = library(identifier: 'jenkins@1.0.0', retriever: modernSCM([ +lib = library(identifier: 'jenkins@1.0.2', retriever: modernSCM([ $class: 'GitSCMSource', remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git', ])) diff --git a/jenkins/promotion/promote-artifacts.jenkinsfile b/jenkins/promotion/promote-artifacts.jenkinsfile index 95370a0baa..eff1bb1a75 100644 --- a/jenkins/promotion/promote-artifacts.jenkinsfile +++ b/jenkins/promotion/promote-artifacts.jenkinsfile @@ -1,4 +1,4 @@ -lib = library(identifier: 'jenkins@1.0.0', retriever: modernSCM([ +lib = library(identifier: 'jenkins@1.0.2', retriever: modernSCM([ $class: 'GitSCMSource', remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git', ])) diff --git a/scripts/components/security/install.sh b/scripts/components/security/install.sh index 97c6b5093d..1df47c0dbe 100755 --- a/scripts/components/security/install.sh +++ b/scripts/components/security/install.sh @@ -72,13 +72,11 @@ fi [ -z "$ARCHITECTURE" ] && ARCHITECTURE=`uname -m` SECURITY_PLUGIN="opensearch-security" -ls -l $OUTPUT/plugins/$SECURITY_PLUGIN/tools -chmod -c 755 $OUTPUT/plugins/$SECURITY_PLUGIN/tools/*.sh if [ "$PLATFORM" = "windows" ]; then - chmod -c 755 $OUTPUT/plugins/$SECURITY_PLUGIN/tools/*.bat # Temporary solution to run shell script on Windows through MinGW # Tracking issue: https://github.com/opensearch-project/security/issues/2148 - $OUTPUT/plugins/$SECURITY_PLUGIN/tools/install_demo_configuration.sh -y -i -s + bash $OUTPUT/plugins/$SECURITY_PLUGIN/tools/install_demo_configuration.sh -y -i -s + fi From 5a96c520b86e216642b4d931595a3216a45549ad Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 11 Oct 2022 22:45:00 +0000 Subject: [PATCH 3/3] Update check for build 2.4.0 to be every 60min Signed-off-by: Peter Zhu --- jenkins/check-for-build.jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/check-for-build.jenkinsfile b/jenkins/check-for-build.jenkinsfile index 64ed458fbb..2538e063be 100644 --- a/jenkins/check-for-build.jenkinsfile +++ b/jenkins/check-for-build.jenkinsfile @@ -16,8 +16,8 @@ pipeline { parameterizedCron ''' H 1 * * * %INPUT_MANIFEST=2.3.1/opensearch-dashboards-2.3.1.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards H 1 * * * %INPUT_MANIFEST=2.3.1/opensearch-2.3.1.yml;TARGET_JOB_NAME=distribution-build-opensearch - 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/60 * * * * %INPUT_MANIFEST=2.4.0/opensearch-dashboards-2.4.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards + H/60 * * * * %INPUT_MANIFEST=2.4.0/opensearch-2.4.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux H 1 * * * %INPUT_MANIFEST=3.0.0/opensearch-3.0.0.yml;TARGET_JOB_NAME=distribution-build-opensearch H 1 * * * %INPUT_MANIFEST=3.0.0/opensearch-dashboards-3.0.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards '''