From c1d7c80aabc95f9dba823908474d20f6fecb02ec Mon Sep 17 00:00:00 2001 From: Roman Muntean <32648346+romakarol@users.noreply.github.com> Date: Mon, 17 Jun 2024 09:35:05 +0100 Subject: [PATCH] Fix iim (#89) * test * revert * t * Revert "t": This reverts commit 5c5c0dd87c83607f3a432313cfd3830021bb57d0. * only 1 test * t * t * t * t * t * t * t * test * cleanup * cleanup --------- Co-authored-by: Roman Muntean --- .github/workflows/main.yml | 8 ++++++-- molecule/__ihs-v90/verify.yml | 2 +- molecule/__liberty/verify.yml | 2 +- molecule/__liberty17/verify.yml | 2 +- molecule/__liberty21/verify.yml | 2 +- molecule/__websphere-v90/verify.yml | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5992df63..d414aa2e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -81,13 +81,17 @@ jobs: ls -la # Fake install cloned collection (required for molecule) mkdir -p $HOME/.ansible/collections/$COLLECTION_NAMESPACE - ln -s ansible_collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME $HOME/.ansible/collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME - + ln -s ansible_collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME $HOME/.ansible/collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME + # - name: Sanity checks # run: | # ansible-test sanity --docker -v --color --python ${{ env.python_ver }} + - name: Molecule run: | cd ${{ env.NEW_REPO_LOC }} + + export DEFAULT_MODULE_PATH=$(pwd)/plugins/modules + echo "DEFAULT_MODULE_PATH: $DEFAULT_MODULE_PATH" ls -la molecule test -s ${{ matrix.scenario }} diff --git a/molecule/__ihs-v90/verify.yml b/molecule/__ihs-v90/verify.yml index 134ea0f6..bf071f5a 100644 --- a/molecule/__ihs-v90/verify.yml +++ b/molecule/__ihs-v90/verify.yml @@ -3,7 +3,7 @@ hosts: all pre_tasks: - name: Check packages - iim_info: + merative.spm_middleware.iim_info: iim_path: /opt/IBM/InstallationManager register: iim_info diff --git a/molecule/__liberty/verify.yml b/molecule/__liberty/verify.yml index 91157a2b..b45874c7 100644 --- a/molecule/__liberty/verify.yml +++ b/molecule/__liberty/verify.yml @@ -9,7 +9,7 @@ - name: Check packages # Assuming 'iim_info' module is part of the 'iim' role or a custom module. # If it's a custom module, ensure that it's properly located in the 'library' directory inside the role. - iim_info: + merative.spm_middleware.iim_info: iim_path: /opt/IBM/InstallationManager register: iim_info - name: Get jvm.options diff --git a/molecule/__liberty17/verify.yml b/molecule/__liberty17/verify.yml index 8607f47e..24289ac6 100644 --- a/molecule/__liberty17/verify.yml +++ b/molecule/__liberty17/verify.yml @@ -9,7 +9,7 @@ - name: Check packages # Assuming 'iim_info' module is part of the 'iim' role or a custom module. # If it's a custom module, ensure that it's properly located in the 'library' directory inside the role. - iim_info: + merative.spm_middleware.iim_info: iim_path: /opt/IBM/InstallationManager register: iim_info - name: Get jvm.options diff --git a/molecule/__liberty21/verify.yml b/molecule/__liberty21/verify.yml index bc8db5a3..0609ffed 100644 --- a/molecule/__liberty21/verify.yml +++ b/molecule/__liberty21/verify.yml @@ -9,7 +9,7 @@ - name: Check packages # Assuming 'iim_info' module is part of the 'iim' role or a custom module. # If it's a custom module, ensure that it's properly located in the 'library' directory inside the role. - iim_info: + merative.spm_middleware.iim_info: iim_path: /opt/IBM/InstallationManager register: iim_info - name: Get jvm.options diff --git a/molecule/__websphere-v90/verify.yml b/molecule/__websphere-v90/verify.yml index d7e0950f..ed906683 100644 --- a/molecule/__websphere-v90/verify.yml +++ b/molecule/__websphere-v90/verify.yml @@ -3,7 +3,7 @@ hosts: all pre_tasks: - name: Check packages - iim_info: + merative.spm_middleware.iim_info: iim_path: /opt/IBM/InstallationManager register: iim_info