Db2 s390x

.github/workflows/build-cli.yml

@@ -140,7 +140,7 @@ jobs:
           password: ${{ secrets.PYPI_API_TOKEN }}
           packages-dir: python/dist
 
-  build-container:
+  build-container-amd64:
     name: Build Container Image
     runs-on: ubuntu-latest
     if: ${{ !contains(github.event.head_commit.message, '[doc]') }}
@@ -180,6 +180,7 @@ jobs:
             wget --header="Authorization:Bearer $ARTIFACTORY_TOKEN" $ARTIFACTORY_GENERIC_RELEASE_URL/ibm-mas/ansible-devops/latest/ibm-mas_devops-latest.tar.gz -O $GITHUB_WORKSPACE/image/cli/install/ibm-mas_devops.tar.gz
           fi
 
+
       # 3. Download Built Artifacts
       # -------------------------------------------------------------------------------------------
       - name: Download the tekton file built in the other job
@@ -201,23 +202,17 @@ jobs:
       - name: Build the container image
         id: docker-build
         run: |
-          $GITHUB_WORKSPACE/build/bin/docker-build.sh -n ibmmas -i cli
+          docker login --username "${{ secrets.QUAYIO_USERNAME }}" --password "${{ secrets.QUAYIO_PASSWORD }}" quay.io
+          $GITHUB_WORKSPACE/build/bin/docker-build.sh -n ibmmas -i cli --target-platform amd64
+          docker images
 
       - name: Push the container image
         id: docker-push
         run: |
-          docker tag ibmmas/cli quay.io/ibmmas/cli:${{ env.DOCKER_TAG }}
+          docker tag ibmmas/cli:${{ env.DOCKER_TAG }}-amd64 quay.io/ibmmas/cli:${{ env.DOCKER_TAG }}-amd64
           docker images
           docker login --username "${{ secrets.QUAYIO_USERNAME }}" --password "${{ secrets.QUAYIO_PASSWORD }}" quay.io
-          docker push quay.io/ibmmas/cli:${{ env.DOCKER_TAG }}
-
-      - name: Push the container image (master)
-        id: docker-push-master
-        if: github.ref == 'refs/heads/master'
-        run: |
-          docker tag ibmmas/cli quay.io/ibmmas/cli:master
-          docker images
-          docker push quay.io/ibmmas/cli:master
+          docker push quay.io/ibmmas/cli:${{ env.DOCKER_TAG }}-amd64
 
       - name: Push the container image (latest)
         id: docker-push-latest
@@ -248,9 +243,9 @@ jobs:
            path: ${{github.workspace}}/reports
            retention-days: 30
 
-  pyinstaller-windows:
-    name: Build Windows CLI
-    runs-on: windows-latest
+  build-container-s390x:
+    name: Build Container Image
+    runs-on: ubuntu-latest
     if: ${{ !contains(github.event.head_commit.message, '[doc]') }}
     needs:
       - build-tekton
@@ -261,172 +256,92 @@ jobs:
       - name: Checkout
         id: checkout
         uses: actions/checkout@v4
-
-      # 2. Run PyInstaller
-      # -------------------------------------------------------------------------------------------
-      - name: Download the tekton file
-        id: download-tekton
-        uses: actions/download-artifact@v4
-        with:
-          name: ibm-mas-tekton.yaml
-          path: ${{ github.workspace }}/python/src/mas/cli/templates/
-
-      - name: Download the python package
-        id: download-python
-        uses: actions/download-artifact@v4
+        # Without this option, we don't get the tag information
         with:
-          name: mas_cli.tar.gz
-          path: ${{ github.workspace }}/
+          fetch-depth: 0
 
-      - name: Build the Windows executable
-        id: build
+      - name: Initialise the build system
+        id: init
         run: |
-          python -m pip install --upgrade pip virtualenv
-          python -m venv .venv
-          .\.venv\Scripts\activate
-          python -m pip install "./mas_cli.tar.gz[dev]"
-          python -m pip list
-          pyinstaller --distpath python/dist --onefile --noconfirm --collect-data mas.devops --collect-data mas.cli python/src/mas-cli
-
-      # 3. Upload and Publish
-      # -------------------------------------------------------------------------------------------
-      - name: Upload mas-cli
-        id: upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: mas-cli-windows-amd64
-          path: ${{ github.workspace }}/python/dist/mas-cli.exe
-          retention-days: 30
+          chmod u+x $GITHUB_WORKSPACE/build/bin/*.sh
+          $GITHUB_WORKSPACE/build/bin/initbuild.sh
+          source $GITHUB_WORKSPACE/build/bin/.functions.sh
 
-      - name: Publish the new cli
-        id: publish
-        if: github.event_name == 'release'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ github.workspace }}/python/dist/mas-cli.exe
-          asset_name: mas-cli-windows-amd64.exe
-          tag: ${{ github.ref }}
-          overwrite: true
-
-  pyinstaller-linux:
-    name: Build Linux CLI
-    runs-on: ubuntu-latest
-    if: ${{ !contains(github.event.head_commit.message, '[doc]') }}
-    needs:
-      - build-tekton
-      - build-python
-    steps:
-      # 1. Initialize the build
+      # 2. Download Ansible collection from Artifactory
       # -------------------------------------------------------------------------------------------
-      - name: Checkout
-        id: checkout
-        uses: actions/checkout@v4
+      - name: Download Ansible collection from Artifactory
+        id: download-ansible
+        if: contains(fromJson('["push", "workflow_dispatch", "repository_dispatch"]'), github.event_name)
+        env:
+          ARTIFACTORY_GENERIC_RELEASE_URL: ${{ secrets.ARTIFACTORY_GENERIC_RELEASE_URL }}
+          ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
+        run: |
+          if [[ -e $GITHUB_WORKSPACE/image/cli/install/ibm-mas_devops.tar.gz ]]; then
+           echo "Found a local Ansible collection to be used in $GITHUB_WORKSPACE/image/cli/install/ibm-mas_devops.tar.gz! Skip download from Artifactory..."
+          else
+           echo "Downloading from ***/ibm-mas/ansible-devops/latest/ibm-mas_devops-latest.tar.gz"
+           wget --header="Authorization:Bearer $ARTIFACTORY_TOKEN" $ARTIFACTORY_GENERIC_RELEASE_URL/ibm-mas/ansible-devops/latest/ibm-mas_devops-latest.tar.gz -O $GITHUB_WORKSPACE/image/cli/install/ibm-mas_devops.tar.gz
+          fi
 
-      # 2. Run PyInstaller
+      # 3. Download Built Artifacts
       # -------------------------------------------------------------------------------------------
-      - name: Download the tekton file
+      - name: Download the tekton file built in the other job
         id: download-tekton
         uses: actions/download-artifact@v4
         with:
           name: ibm-mas-tekton.yaml
-          path: ${{ github.workspace }}/python/src/mas/cli/templates/
+          path: ${{ github.workspace }}/image/cli/mascli/templates/
 
       - name: Download the python package
         id: download-python
         uses: actions/download-artifact@v4
         with:
           name: mas_cli.tar.gz
-          path: ${{ github.workspace }}/
+          path: ${{ github.workspace }}/image/cli/install/
 
-      - name: Build the Linux executable
-        id: build
+      # 4. CLI container image
+      # -------------------------------------------------------------------------------------------
+      - name: Build the container image
+        id: docker-build
         run: |
-          python -m pip install --upgrade pip virtualenv
-          python -m venv .venv
-          source .venv/bin/activate
-          python -m pip install ./mas_cli.tar.gz[dev]
-          python -m pip list
-          pyinstaller --distpath python/dist --onefile --noconfirm --collect-data mas.devops --collect-data mas.cli python/src/mas-cli
+          $GITHUB_WORKSPACE/build/bin/docker-build.sh -n ibmmas -i cli --target-platform s390x
 
-      # 3. Upload and Publish
-      # -------------------------------------------------------------------------------------------
-      - name: Upload mas-cli
-        id: upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: mas-cli-linux-amd64
-          path: ${{ github.workspace }}/python/dist/mas-cli
-          retention-days: 30
+      - name: Push the container image
+        id: docker-push
+        run: |
+          docker images
+          docker tag ibmmas/cli:${{ env.DOCKER_TAG }}-s390x  quay.io/ibmmas/cli:${{ env.DOCKER_TAG }}-s390x
+          docker images
+          docker login --username "${{ secrets.QUAYIO_USERNAME }}" --password "${{ secrets.QUAYIO_PASSWORD }}" quay.io
+          docker push quay.io/ibmmas/cli:${{ env.DOCKER_TAG }}-s390x
 
-      - name: Publish the new cli
-        id: publish
+      - name: Push the container image (latest)
+        id: docker-push-latest
         if: github.event_name == 'release'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ github.workspace }}/python/dist/mas-cli
-          asset_name: mas-cli-linux-amd64
-          tag: ${{ github.ref }}
-          overwrite: true
-
-  pyinstaller-macos:
-    name: Build MacOS CLI
-    runs-on: macos-latest
-    if: ${{ !contains(github.event.head_commit.message, '[doc]') }}
-    needs:
-      - build-tekton
-      - build-python
+        run: |
+          docker tag ibmmas/cli quay.io/ibmmas/cli:latest
+          docker images
+          docker push quay.io/ibmmas/cli:latest
+
+  build-cli-manifest:
+    runs-on: ubuntu-latest
+    needs: [ build-container-amd64, build-container-s390x ]
     steps:
-      # 1. Initialize the build
+      # 1. Setup
       # -------------------------------------------------------------------------------------------
       - name: Checkout
-        id: checkout
         uses: actions/checkout@v4
-
-      # 2. Run PyInstaller
-      # -------------------------------------------------------------------------------------------
-      - name: Download the tekton file
-        id: download-tekton
-        uses: actions/download-artifact@v4
-        with:
-          name: ibm-mas-tekton.yaml
-          path: ${{ github.workspace }}/python/src/mas/cli/templates/
-
-      - name: Download the python package
-        id: download-python
-        uses: actions/download-artifact@v4
+        # Without this option, we don't get the tag information
         with:
-          name: mas_cli.tar.gz
-          path: ${{ github.workspace }}/
-
-      - name: Build the Linux executable
-        id: build
+          fetch-depth: 0
+      - name: Initialise the build system
         run: |
-          python -m pip install --upgrade pip virtualenv
-          python -m venv .venv
-          source .venv/bin/activate
-          python -m pip install ./mas_cli.tar.gz[dev]
-          python -m pip list
-          pyinstaller --distpath python/dist --onefile --noconfirm --collect-data mas.devops --collect-data mas.cli python/src/mas-cli
-
-      # 3. Upload and Publish
+          chmod u+x $GITHUB_WORKSPACE/build/bin/*.sh
+          $GITHUB_WORKSPACE/build/bin/initbuild.sh
+          source $GITHUB_WORKSPACE/build/bin/.functions.sh
+      # 3. Manifest and publish release base container image of cli
       # -------------------------------------------------------------------------------------------
-      - name: Upload mas-cli
-        id: upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: mas-cli-macos-arm64
-          path: ${{ github.workspace }}/python/dist/mas-cli
-          retention-days: 30
-
-      - name: Publish the new cli
-        id: publish
-        if: github.event_name == 'release'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ github.workspace }}/python/dist/mas-cli
-          asset_name: mas-cli-macos-arm64
-          tag: ${{ github.ref }}
-          overwrite: true
+      - name: Publish release cli
+        run: |
+          docker login --username "${{ secrets.QUAYIO_USERNAME }}" --password "${{ secrets.QUAYIO_PASSWORD }}" quay.io
+          $GITHUB_WORKSPACE/build/bin/docker-manifest.sh -n ibmmas -i cli --target-platforms amd64,s390x

build/bin/.functions.sh

@@ -43,6 +43,38 @@ function echo_highlight() {
   echo "${COLOR_MAGENTA}$1"
 }
 
+#Install buildx
+# -----------------------------------------------------------------------------
+# Useful links:
+# - https://docs.docker.com/engine/reference/commandline/buildx_build/#output
+# - https://docs.docker.com/build/building/multi-platform/
+# - https://medium.com/@artur.klauser/building-multi-architecture-docker-images-with-buildx-27d80f7e2408
+# - https://stackoverflow.com/questions/65365797/docker-buildx-exec-user-process-caused-exec-format-error
+function install_buildx() {
+ # docker buildx use mybuilder &> /dev/null
+  echo "install_buildx"
+ # if [ "$?" != "0" ]; then
+     echo "inside0 install_buildx"
+    mkdir -vp ~/.docker/cli-plugins/
+    #https://download.docker.com/linux/rhel/8/x86_64/stable/Packages/docker-buildx-plugin-0.16.1-1.el8.x86_64.rpm
+    curl --silent -L "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
+    chmod a+x ~/.docker/cli-plugins/docker-buildx
+    echo "inside 1 install_buildx"
+    sudo apt-get update
+    echo "inside 1-1 install_buildx"
+    sudo apt-get install -y qemu-user-static
+    echo "inside2 install_buildx"
+    qemu-aarch64-static --version
+    echo "inside3 install_buildx"
+    sudo apt-get install -y binfmt-support
+    update-binfmts --version
+    docker buildx create --name mybuilder
+    docker buildx use mybuilder
+#  fi
+  docker version || exit 1
+  docker buildx version || exit 1
+  docker buildx inspect --bootstrap || exit 1
+}
 
 # These should be loaded already, but just incase!
 # ------------------------------------------------

build/bin/build-docs.sh

@@ -5,10 +5,10 @@
 find docs -type f -name '*.md' -exec sed -i \
   -e 's/@@CLI_LATEST_VERSION@@/11.1.3/g' \
   -e 's/@@MAS_PREVIOUS_CHANNEL@@/8.11.x/g' \
-  -e 's/@@MAS_PREVIOUS_CATALOG@@/v8-240730-amd64/g' \
+  -e 's/@@MAS_PREVIOUS_CATALOG@@/v8-240827-amd64/g' \
   -e 's/@@MAS_LATEST_CHANNEL@@/9.0.x/g' \
   -e 's/@@MAS_LATEST_CHANNEL_MANAGE@@/9.0.x/g' \
-  -e 's/@@MAS_LATEST_CATALOG@@/v9-240827-amd64/g' \
+  -e 's/@@MAS_LATEST_CATALOG@@/v9-241003-amd64/g' \
   {} \;
 
 python -m pip install -q mkdocs mkdocs-redirects