Resolve install demo config access issue and use 1.0.2 lib to fix min…

…Upload for Windows (opensearch-project#2721) * Test Again Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Test 1.0.2 lib Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Update check for build 2.4.0 to be every 60min Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: Monu Singh <msnghgw@amazon.com>
monusingh-1 · Nov 2, 2022 · fe47855 · fe47855
1 parent 03aca29
commit fe47855
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git 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
         '''

diff --git 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
@@ -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
@@ -72,12 +72,11 @@ fi
 [ -z "$ARCHITECTURE" ] && ARCHITECTURE=`uname -m`
 
 SECURITY_PLUGIN="opensearch-security"
-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