Merge remote-tracking branch 'origin/v3-deprecate-vsam' into v3-depre…

…cate-vsam
zowe · Sep 5, 2024 · 2b63d20 · 2b63d20
2 parents 4e621c8 + 35fd7b2
commit 2b63d20
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml
@@ -1,4 +1,11 @@
 name: Zowe CICD Integration Tests
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+  statuses: write
+
 on:   
   workflow_dispatch:
     inputs:

diff --git a/containers/base-jdk/ubi/Dockerfile b/containers/base-jdk/ubi/Dockerfile
@@ -24,8 +24,8 @@ LABEL name="Zowe Base Image with JDK enabled" \
 ##################################
 # Install JDK
 RUN microdnf install --nodocs \
-  java-11-openjdk-headless \
+  java-17-openjdk-headless \
   && microdnf clean all --enablerepo='*' \
   # smoke tests
   && java -version
-ENV JAVA_HOME=/usr/lib/jvm/jre-1.11.0
+ENV JAVA_HOME=/usr/lib/jvm/jre-1.17.0
diff --git a/containers/base-jdk/ubuntu/Dockerfile b/containers/base-jdk/ubuntu/Dockerfile
@@ -23,14 +23,11 @@ LABEL name="Zowe Base Image with JDK enabled" \
 
 ##################################
 
-# Install JDK. We manually add apt sources to avoid installing python, which is required for add-apt-repository.
-RUN CODENAME=$(cat /etc/os-release | grep UBUNTU_CODENAME | cut -d "=" -f 2) \
-  && echo deb [trusted=yes] https://ppa.launchpadcontent.net/openjdk-r/ppa/ubuntu "$CODENAME" main >> /etc/apt/sources.list \
-  && echo deb-src [trusted=yes] https://ppa.launchpadcontent.net/openjdk-r/ppa/ubuntu "$CODENAME" main >> /etc/apt/sources.list \
-  && apt-get update \
+# Install JDK. 
+RUN apt-get update \
   && apt-get install -y \
-  openjdk-11-jre \
+  openjdk-17-jre \
   && rm -rf /var/lib/apt/lists/* \
   # smoke tests
   && java -version
-ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/jre
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64/jre