update versions of Liberty (#38)

* update versions of Liberty * update ansible-lint * update ansible-lint * update versions * update roles * add debug * update ci.requirements * roll back some changes * fix incorrect path * readd Galaxy push * test publish * run test on version * test galaxy read * test version * update main and galaxy * move to global variable * more release to release.yml
merative · Oct 20, 2022 · 8161179 · 8161179
1 parent 08e0f83
commit 8161179
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 40 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,7 +33,6 @@ jobs:
         scenario:
           - websphere-v90-centos-8
           - websphere-v85-centos-7
-          - db21145
           - db21146
           - db21157
           - oracle12cR1-centos-7
@@ -90,19 +89,3 @@ jobs:
       - name: Molecule
         run: |
           molecule test -s ${{ matrix.scenario }}
-      # - name: Publish to Galaxy
-      #   env:
-      #     ANSIBLE_GALAXY_SERVER_LIST: release
-      #     ANSIBLE_GALAXY_SERVER_RELEASE_URL: https://galaxy.ansible.com/
-      #     ANSIBLE_GALAXY_SERVER_RELEASE_TOKEN: "${{ secrets.GALAXY_TOKEN }}"
-      #   run: |
-      #     ansible-galaxy collection build
-      #     ls -l *.tar.gz
-      #     ansible-galaxy collection publish -c -vvv "./${{ env.collection_namespace }}-${{ env.collection_name }}-*.tar.gz"
-      # - name: Create GitHub Release
-      #   uses: marvinpinto/action-automatic-releases@latest
-      #   with:
-      #     repo_token: "${{ secrets.GITHUB_TOKEN }}"
-      #     prerelease: false
-      #     files: |
-      #       ${{ env.collection_namespace }}-${{ env.collection_name }}-*.tar.gz
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,6 +20,7 @@ jobs:
       collection_namespace: ibm
       collection_name: spm_middleware
       python_ver: 3.8
+      version: 1.1.6
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -50,22 +51,19 @@ jobs:
           mkdir -pv ~/.ansible/collections/${{ env.collection_namespace }}
           ln -s ansible_collections/${{ env.collection_namespace }}/${{ env.collection_name }} ~/.ansible/collections/${{ env.collection_namespace }}/${{ env.collection_name }}
           chmod -v +x ./scripts/*
-      - name: Not fully ready yet
+      - name: Publish to Galaxy
+        env:
+          ANSIBLE_GALAXY_SERVER_LIST: release
+          ANSIBLE_GALAXY_SERVER_RELEASE_URL: https://galaxy.ansible.com/
+          ANSIBLE_GALAXY_SERVER_RELEASE_TOKEN: "${{ secrets.GALAXY_TOKEN }}"
         run: |
-          echo "Need more test before push to https://galaxy.ansible.com/"
-      # - name: Publish to Galaxy
-      #   env:
-      #     ANSIBLE_GALAXY_SERVER_LIST: release
-      #     ANSIBLE_GALAXY_SERVER_RELEASE_URL: https://galaxy.ansible.com/
-      #     ANSIBLE_GALAXY_SERVER_RELEASE_TOKEN: "${{ secrets.GALAXY_TOKEN }}"
-      #   run: |
-      #     ansible-galaxy collection build
-      #     ls -l *.tar.gz
-      #     ansible-galaxy collection publish -c -vvv "./${{ env.collection_namespace }}-${{ env.collection_name }}-*.tar.gz"
-      # - name: Create GitHub Release
-      #   uses: marvinpinto/action-automatic-releases@latest
-      #   with:
-      #     repo_token: "${{ secrets.GITHUB_TOKEN }}"
-      #     prerelease: false
-      #     files: |
-      #       ${{ env.collection_namespace }}-${{ env.collection_name }}-*.tar.gz
+          ansible-galaxy collection build
+          ls -l *.tar.gz
+          ansible-galaxy collection publish -c -vvv "./${{ env.collection_namespace }}-${{ env.collection_name }}-${{ env.version }}.tar.gz"
+      - name: Create GitHub Release
+        uses: marvinpinto/action-automatic-releases@latest
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          prerelease: false
+          files: |
+            ${{ env.collection_namespace }}-${{ env.collection_name }}-${{ env.version }}.tar.gz
diff --git a/ci-requirements.txt b/ci-requirements.txt
@@ -3,7 +3,7 @@ pywinrm
 molecule==3.3.0
 molecule-docker
 docker
-ansible-lint
+ansible-lint >= 5.1.1, < 6.0.0 # only for the prerun functionality
 yamllint
 passlib
 jmespath

diff --git a/galaxy.yml b/galaxy.yml
@@ -10,7 +10,8 @@ namespace: ibm
 name: spm_middleware
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.1.4
+# Please note. version also exists in /github/workflows/release.yml and will need to be update also
+version: 1.1.6
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 ansible==4.6.0
 ansible-compat==0.5.0
 ansible-core==2.11.5
-ansible-lint==5.1.3
+ansible-lint >= 5.1.1, < 6.0.0 # only for the prerun functionality
 appdirs==1.4.4
 arrow==1.1.1
 asn1crypto==1.4.0

diff --git a/roles/liberty/README.md b/roles/liberty/README.md
@@ -11,7 +11,7 @@ IBM Installation Manager (1.9.x) must already be installed in the target environ
 | Property Name           | Default value                                       |
 | ----------------------- | --------------------------------------------------- |
 | `liberty_install_path`  | `/opt/IBM/WebSphere/Liberty`                        |
-| `liberty_version`       | `21.0.0.9`                                          |
+| `liberty_version`       | `22.0.0.6`                                          |
 | `liberty_default_heapsize`  | `1024m`                                         |
 | `liberty_enable_verbose_gc` | `false`                                         |
 | `liberty_extra_jvm_options` | `[]`                                            |

diff --git a/roles/liberty/defaults/main.yml b/roles/liberty/defaults/main.yml
@@ -3,7 +3,7 @@ iim_install_path: /opt/IBM/InstallationManager
 
 liberty_install_path: /opt/IBM/WebSphere/Liberty
 
-liberty_version: 21.0.0.9
+liberty_version: 22.0.0.6
 
 # Default JVM Options
 liberty_default_heapsize: 1024m

diff --git a/roles/liberty/vars/v21.0.0.12.yml b/roles/liberty/vars/v21.0.0.12.yml
@@ -0,0 +1,7 @@
+---
+liberty_fp_path: WLP/21.0.0.12-WS-LIBERTY-ND-FP.zip
+liberty_installers_path: WLP/was.repo.16002.liberty.nd.zip
+liberty_pid: 21.0.12.20211117_1256
+
+liberty_java_zip_path: Java/IBM/ibm-java-sdk-8.0-7.0-linux-x64-installmgr.zip
+liberty_java_pid: com.ibm.java.jdk.v8_8.0.7000.20211025_1430
diff --git a/roles/liberty/vars/v22.0.0.3.yml b/roles/liberty/vars/v22.0.0.3.yml
@@ -0,0 +1,7 @@
+---
+liberty_fp_path: WLP/22.0.0.3-WS-LIBERTY-ND-FP.zip
+liberty_installers_path: WLP/was.repo.16002.liberty.nd.zip
+liberty_pid: 22.0.3.20220302_1100
+
+liberty_java_zip_path: Java/IBM/ibm-java-sdk-8.0-7.0-linux-x64-installmgr.zip
+liberty_java_pid: com.ibm.java.jdk.v8_8.0.7000.20211025_1430
diff --git a/roles/liberty/vars/v22.0.0.6.yml b/roles/liberty/vars/v22.0.0.6.yml
@@ -0,0 +1,7 @@
+---
+liberty_fp_path: WLP/22.0.0.6-WS-LIBERTY-ND-FP.zip
+liberty_installers_path: WLP/was.repo.16002.liberty.nd.zip
+liberty_pid: 22.0.6.20220523_1607
+
+liberty_java_zip_path: Java/IBM/ibm-java-sdk-8.0-7.0-linux-x64-installmgr.zip
+liberty_java_pid: com.ibm.java.jdk.v8_8.0.7000.20211025_1430
diff --git a/roles/liberty/vars/v22.0.0.9.yml b/roles/liberty/vars/v22.0.0.9.yml
@@ -0,0 +1,7 @@
+---
+liberty_fp_path: WLP/22.0.0.9-WS-LIBERTY-ND-FP.zip
+liberty_installers_path: WLP/was.repo.16002.liberty.nd.zip
+liberty_pid: 22.0.9.20220815_1901
+
+liberty_java_zip_path: Java/IBM/ibm-java-sdk-8.0-7.0-linux-x64-installmgr.zip
+liberty_java_pid: com.ibm.java.jdk.v8_8.0.7000.20211025_1430