Add missing jdk changes from al2023 update (#477)

Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Jul 17, 2024 · 4aa5607 · 4aa5607
1 parent ec91fda
commit 4aa5607
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/compute/jenkins-main-node.ts b/lib/compute/jenkins-main-node.ts
@@ -239,18 +239,18 @@ export class JenkinsMainNode {
       InitPackage.yum('openssl'),
       InitPackage.yum('mod_ssl'),
       InitPackage.yum('amazon-efs-utils'),
-      InitCommand.shellCommand('amazon-linux-extras install java-openjdk11 -y'),
       InitPackage.yum('docker'),
       InitPackage.yum('python3'),
       InitPackage.yum('python3-pip.noarch'),
+      InitPackage.yum('java-11-amazon-corretto'),
       InitCommand.shellCommand('pip3 install botocore'),
       InitCommand.shellCommand('systemctl enable crond.service'),
       InitCommand.shellCommand('systemctl start crond.service'),
       // eslint-disable-next-line max-len
       InitCommand.shellCommand('sudo wget -nv https://github.com/mikefarah/yq/releases/download/v4.22.1/yq_linux_amd64 -O /usr/bin/yq && sudo chmod +x /usr/bin/yq'),
       // eslint-disable-next-line max-len
       InitCommand.shellCommand('sudo curl -L https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/bin/docker-compose && sudo chmod +x /usr/bin/docker-compose'),
-      InitCommand.shellCommand('python3 -m pip install --upgrade pip && python3 -m pip install cryptography boto3 requests-aws4auth'),
+      InitCommand.shellCommand('pip3 install cryptography boto3 requests-aws4auth'),
 
       InitCommand.shellCommand(httpConfigProps.useSsl
         // eslint-disable-next-line max-len

diff --git a/test/compute/jenkins-main-node.test.ts b/test/compute/jenkins-main-node.test.ts
@@ -26,8 +26,8 @@ describe('JenkinsMainNode Config Elements', () => {
 
   // THEN
   test('Config elements expected counts', async () => {
-    expect(configElements.filter((e) => e.elementType === 'COMMAND')).toHaveLength(24);
-    expect(configElements.filter((e) => e.elementType === 'PACKAGE')).toHaveLength(10);
+    expect(configElements.filter((e) => e.elementType === 'COMMAND')).toHaveLength(23);
+    expect(configElements.filter((e) => e.elementType === 'PACKAGE')).toHaveLength(11);
     expect(configElements.filter((e) => e.elementType === 'FILE')).toHaveLength(4);
   });