Zowe Suite v3.0.0

zowe · Oct 1, 2024 · 4e82649 · 4e82649
2 parents e4bd796 + bf4e21f
commit 4e82649
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 40 deletions.
diff --git a/.github/workflows/build-core.yml b/.github/workflows/build-core.yml
@@ -4,7 +4,9 @@ on:
     - cron: '30 6 * * *'
   push:
     branches:
-      - v2.x/staging
+      - v3.x/staging
+      - v3.x/rc
+      - v3.x/master
   pull_request:
     types: [opened, reopened, synchronize]
 
@@ -30,9 +32,9 @@ on:
         description: 'zlux-shared PR number'
         required: false
       DEFAULT_BRANCH:
-        description: 'please enter the default branch you would like to build with, default will be v2.x/staging'
+        description: 'please enter the default branch you would like to build with, default will be v3.x/staging'
         required: false
-        default: 'v2.x/staging'
+        default: 'v3.x/staging'
 
 jobs:
   check-permission:
@@ -149,17 +151,17 @@ jobs:
             ${{ runner.os }}-build-cache-node-modules-
       
       - name: '[Prep 2] Setup Node'
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: 16.15.0
+          node-version: 18
 
       - name: '[Prep 3] Setup jFrog CLI'
         uses: jfrog/setup-jfrog-cli@v2
         env:
           JF_ARTIFACTORY_1: ${{ secrets.JF_ARTIFACTORY_TOKEN }}
 
       - name: '[Prep 4] prepare workflow'
-        uses: zowe-actions/zlux-builds/core/prepare@v2.x/main
+        uses: zowe-actions/zlux-builds/core/prepare@v3.x/main
         with:
           github-user: ${{ secrets.ZOWE_ROBOT_USER }}
           github-password: ${{ secrets.ZOWE_ROBOT_TOKEN }}
@@ -168,7 +170,7 @@ jobs:
           default-base: ${{ github.event.inputs.DEFAULT_BRANCH }}
 
       - name: '[Prep 5] build'
-        uses: zowe-actions/zlux-builds/core/build@v2.x/main
+        uses: zowe-actions/zlux-builds/core/build@v3.x/main
         with:
           zlux-app-manager: ${{ github.event.inputs.ZLUX_APP_MANAGER }}
           zlux-app-server: ${{ github.event.inputs.ZLUX_APP_SERVER }}
@@ -178,12 +180,12 @@ jobs:
           zlux-shared: ${{ github.event.inputs.ZLUX_SHARED }}
 
       - name: '[Prep 6] packaging'
-        uses: zowe-actions/zlux-builds/core/package@v2.x/main
+        uses: zowe-actions/zlux-builds/core/package@v3.x/main
         with:
           pax-ssh-username: ${{ secrets.SSH_MARIST_USERNAME }}
           pax-ssh-password: ${{ secrets.SSH_MARIST_RACF_PASSWORD }}
           pax-name: zlux-core
 
       - name: '[Prep 7] deploy'
-        uses: zowe-actions/zlux-builds/core/deploy@v2.x/main
+        uses: zowe-actions/zlux-builds/core/deploy@v3.x/main
 
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -6,7 +6,7 @@ on:
       branch:
         description: 'Please enter the zowe-install-packaging branch name'
         required: false
-        default: 'v2.x/staging'
+        default: 'v3.x/staging'
       release:
         description: 'Whether this is a test build or official release'
         required: true
@@ -38,8 +38,6 @@ jobs:
           cpu-arch: amd64
 
       - uses: zowe-actions/shared-actions/docker-build-local@main
-        with:
-          build-arg-list: ZOWE_BASE_IMAGE=latest-ubuntu
         timeout-minutes: 5
 
 
@@ -65,8 +63,6 @@ jobs:
           cpu-arch: amd64
 
       - uses: zowe-actions/shared-actions/docker-build-local@main
-        with:
-          build-arg-list: ZOWE_BASE_IMAGE=latest-ubi
         timeout-minutes: 5
 
   build-ubuntu-s390x:
@@ -95,7 +91,6 @@ jobs:
           zlinux-ssh-user: ${{ secrets.ZLINUX_SSH_USER }}
           zlinux-ssh-key: ${{ secrets.ZLINUX_SSH_KEY }}
           zlinux-ssh-passphrase: ${{ secrets.ZLINUX_SSH_PASSPHRASE }}
-          build-arg-list: ZOWE_BASE_IMAGE=latest-ubuntu
         timeout-minutes: 10
 
 
@@ -125,7 +120,6 @@ jobs:
           zlinux-ssh-user: ${{ secrets.ZLINUX_SSH_USER }}
           zlinux-ssh-key: ${{ secrets.ZLINUX_SSH_KEY }}
           zlinux-ssh-passphrase: ${{ secrets.ZLINUX_SSH_PASSPHRASE }}
-          build-arg-list: ZOWE_BASE_IMAGE=latest-ubi
         timeout-minutes: 10
 
 

diff --git a/.github/workflows/rc-build.yml b/.github/workflows/rc-build.yml
@@ -36,17 +36,17 @@ jobs:
             ${{ runner.os }}-build-cache-node-modules-
       
       - name: '[Prep 2] Setup Node'
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: 16.15.0
+          node-version: 18
 
       - name: '[Prep 3] Setup jFrog CLI'
         uses: jfrog/setup-jfrog-cli@v2
         env:
           JF_ARTIFACTORY_1: ${{ secrets.JF_ARTIFACTORY_TOKEN }}
 
       - name: '[Prep 4] prepare workflow'
-        uses: zowe-actions/zlux-builds/core/prepare@v2.x/rc
+        uses: zowe-actions/zlux-builds/core/prepare@v3.x/rc
         with:
           github-user: ${{ secrets.ZOWE_ROBOT_USER }}
           github-password: ${{ secrets.ZOWE_ROBOT_TOKEN }}
@@ -55,14 +55,14 @@ jobs:
           zowe-version: ${{ github.event.inputs.ZOWE_VERSION }}
 
       - name: '[Prep 5] build'
-        uses: zowe-actions/zlux-builds/core/build@v2.x/rc
+        uses: zowe-actions/zlux-builds/core/build@v3.x/rc
 
       - name: '[Prep 6] packaging'
-        uses: zowe-actions/zlux-builds/core/package@v2.x/rc
+        uses: zowe-actions/zlux-builds/core/package@v3.x/rc
         with:
           pax-ssh-username: ${{ secrets.SSH_MARIST_USERNAME }}
           pax-ssh-password: ${{ secrets.SSH_MARIST_RACF_PASSWORD }}
           pax-name: zlux-core
 
       - name: '[Prep 7] deploy'
-        uses: zowe-actions/zlux-builds/core/deploy@v2.x/rc
+        uses: zowe-actions/zlux-builds/core/deploy@v3.x/rc
diff --git a/build.xml b/build.xml
@@ -70,6 +70,7 @@
   <target name="removeSource" description="Remove source code and all files that are not needed for production">
     <ant antfile="build_ng2.xml" target="removeSource" dir="."/>
   </target>
+
 
 </project>
 

diff --git a/build_ng2.xml b/build_ng2.xml
@@ -30,7 +30,8 @@
       <param name="buildType" value="build"/>
     </antcall>
 
-    <antcall target="npmInstall">
+    <!-- TODO: Update component's dependencies such that install passes with npmInstall -->
+    <antcall target="npmInstallLegacy">
       <param name="packagejson.Location" value="${capstone}/zlux-app-manager/system-apps/admin-notification-app/webClient"/>
     </antcall>
     <antcall target="npmBuild">
@@ -52,10 +53,6 @@
       <param name="packagejson.Location" value="${capstone}/zlux-app-manager/system-apps/web-browser-app/nodeServer"/>
       <param name="buildType" value="build"/>
     </antcall>
-
-    <antcall target="npmRunI18n">
-      <param name="packagejson.Location" value="${capstone}/zlux-app-manager/virtual-desktop"/>
-    </antcall>
 
     <copy file="${capstone}/zlux-app-manager/virtual-desktop/node_modules/requirejs/require.js" tofile="${capstone}/zlux-app-manager/virtual-desktop/web/require.js" unless:set="isZos"/>
 
@@ -76,6 +73,9 @@
           <exclude name="zlux-app-server/node_modules/**"/>
           <exclude name="zlux-server-framework/node_modules/**"/>
         </dirset>
+        <dirset dir="${capstone}" defaultexcludes="false">
+          <include name="zlux-app-manager/system-apps/app-generator/**"/>
+        </dirset>
         <dirset dir="${capstone}" defaultexcludes="false">
           <include name="**/src"/>
           <include name="**/dts"/>
@@ -114,6 +114,7 @@
     </for>
   </target>
 
+
   <target name="removeZssSource">
     <!-- <delete><fileset .../>...</delete> is extremely slow -->
     <for param="path">
@@ -238,29 +239,29 @@
     </if>
   </target>
 
-  <target name="npmRunI18n" depends="package.jsonExists" if="package.jsonPresent">
-    <exec executable="cmd"
-          dir="${packagejson.Location}"
+  <target name="npmInstallLegacy" depends="package.jsonExists" if="package.jsonPresent">
+    <exec executable="cmd" 
+          dir="${packagejson.Location}" 
           osfamily="windows"
           resultproperty="rc"
           searchpath="true">
-      <arg line="/c npm run i18n"/>
+      <arg line="/c npm install --legacy-peer-deps"/>
     </exec>
-    <exec executable="npm"
+    <exec executable="npm" 
           dir="${packagejson.Location}"
           osfamily="unix"
           resultproperty="rc"
           searchpath="true">
-      <arg line="run i18n"/>
+      <arg line="install"/>
     </exec>
-
-    <echo message="Result of i18n in ${packagejson.Location} is: ${rc}"/>
+    
+    <echo message="Result of install in ${packagejson.Location} is: ${rc}"/>
     <if>
       <not>
         <equals arg1="${rc}" arg2="0"/>
       </not>
       <then>
-        <fail message="Error with npm run i18 in ${packagejson.Location}" />
+        <fail message="Error with npm install in ${packagejson.Location}" />
       </then>
     </if>
   </target>

diff --git a/container/Dockerfile.zlux b/container/Dockerfile.zlux
@@ -10,7 +10,7 @@
 #                                                                                       #
 #########################################################################################
 # base image tag
-ARG ZOWE_BASE_IMAGE=latest-ubuntu
+ARG ZOWE_BASE_IMAGE=3-ubuntu
 
 FROM zowe-docker-release.jfrog.io/ompzowe/base-node:${ZOWE_BASE_IMAGE} AS builder
 
@@ -52,12 +52,12 @@ USER zowe
 RUN if [ ! -d ${ZWED_INSTALL_DIR}/share/zlux-app-server ]; then cd ${ZWED_INSTALL_DIR}/share && tar -xf zlux-core.tar; fi
 
 RUN cd ${ZWED_INSTALL_DIR}/share/zlux-app-server/bin && \
-chmod +x *.sh && \
-./install-container.sh
+      chmod +x *.sh && \
+      ./install-container.sh
 
 # remove default explorer-ip plugin json 
 RUN if [ -f ${ZWED_INSTALL_DIR}/share/zlux-app-server/defaults/plugins/org.zowe.explorer-ip.json ]; \
-then rm ${ZWED_INSTALL_DIR}/share/zlux-app-server/defaults/plugins/org.zowe.explorer-ip.json; fi
+      then rm ${ZWED_INSTALL_DIR}/share/zlux-app-server/defaults/plugins/org.zowe.explorer-ip.json; fi
 
 WORKDIR ${ZWED_INSTALL_DIR}/bin
 CMD ["./start-container.sh"]