Add k-NN required zip and JDK19 for Core (#213)

Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Oct 27, 2022 · 0dc2443 · 0dc2443
1 parent 6eba272
commit 0dc2443
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/lib/compute/agent-nodes.ts b/lib/compute/agent-nodes.ts
@@ -148,7 +148,7 @@ export class AgentNodes {
       maxTotalUses: -1,
       minimumNumberOfSpareInstances: 2,
       numExecutors: 1,
-      amiId: 'ami-0805008fb781e18b8',
+      amiId: 'ami-04e3e1e593eb9b709',
       initScript: 'echo',
       remoteFs: 'C:\\Users\\Administrator\\jenkins',
     };
@@ -160,7 +160,7 @@ export class AgentNodes {
       maxTotalUses: 1,
       minimumNumberOfSpareInstances: 1,
       numExecutors: 1,
-      amiId: 'ami-0805008fb781e18b8',
+      amiId: 'ami-04e3e1e593eb9b709',
       initScript: 'echo',
       remoteFs: 'C:\\Users\\Administrator\\jenkins',
     };

diff --git a/packer/scripts/windows/scoop-install-commons.ps1 b/packer/scripts/windows/scoop-install-commons.ps1
@@ -138,3 +138,5 @@ gh version
 scoop install cmake
 cmake --version
 
+# Install zip
+scoop install zip
diff --git a/resources/baseJenkins.yaml b/resources/baseJenkins.yaml
@@ -183,6 +183,12 @@ tool:
           installers:
           - adoptOpenJdkInstaller:
               id: "jdk-17.0.3+7"
+    - name: "openjdk-19"
+      properties:
+      - installSource:
+          installers:
+          - adoptOpenJdkInstaller:
+              id: "jdk-19.0.1+10"
   mavenGlobalConfig:
     globalSettingsProvider: "standard"
     settingsProvider: "standard"

diff --git a/test/data/test_env.yaml b/test/data/test_env.yaml
@@ -196,6 +196,12 @@ tool:
               installers:
                 - adoptOpenJdkInstaller:
                     id: jdk-17.0.3+7
+      - name: openjdk-19
+        properties:
+          - installSource:
+              installers:
+                - adoptOpenJdkInstaller:
+                    id: jdk-19.0.1+10
   mavenGlobalConfig:
     globalSettingsProvider: standard
     settingsProvider: standard