From 6d2567b6c05e9357cb2ed48d1bc6c6cbeb3747d6 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Mon, 20 Jul 2020 16:06:40 -0500 Subject: [PATCH 1/6] Fixes #167: Re-order ansible installation so it doesn't break on molecule test. --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63e458be..c5ebde97 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,12 +83,12 @@ jobs: with: python-version: ${{ matrix.python_version }} - - name: Install molecule and openshift dependencies - run: pip install molecule yamllint openshift flake8 - - name: Install ansible base (devel branch) run: pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check + - name: Install molecule and openshift dependencies + run: pip install molecule yamllint openshift flake8 + - name: Create default collection path symlink run: | mkdir -p /home/runner/.ansible From 4a2b1b918b2a0cb2a2ddb4af0ccfcd24eed4052f Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Mon, 20 Jul 2020 16:25:35 -0500 Subject: [PATCH 2/6] Issue #167: Make yamllint less bothersome and install ansible-base in different order. --- .github/workflows/ci.yml | 8 +++++--- .yamllint | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5ebde97..9a77c4db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,12 +83,14 @@ jobs: with: python-version: ${{ matrix.python_version }} - - name: Install ansible base (devel branch) - run: pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check - - name: Install molecule and openshift dependencies run: pip install molecule yamllint openshift flake8 + - name: Install ansible base (devel branch) + run: | + pip uninstall ansible + pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check + - name: Create default collection path symlink run: | mkdir -p /home/runner/.ansible diff --git a/.yamllint b/.yamllint index 39cf067b..45b68407 100644 --- a/.yamllint +++ b/.yamllint @@ -8,6 +8,7 @@ rules: brackets: max-spaces-inside: 1 level: error + document-start: disable line-length: disable truthy: disable indentation: From f4f4ec6fcf462089c066f13cf59250d7c41ccdaf Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Mon, 20 Jul 2020 16:31:49 -0500 Subject: [PATCH 3/6] Issue #167: More fixes, oops. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a77c4db..6b3923bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,7 +88,7 @@ jobs: - name: Install ansible base (devel branch) run: | - pip uninstall ansible + pip uninstall -y ansible pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check - name: Create default collection path symlink From 9c0f7fe0bacd5da8d76a4e55540416cf5865af86 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Thu, 23 Jul 2020 11:06:56 -0500 Subject: [PATCH 4/6] Issue #167: Attempt installing ansible's stable-2.10 branch. --- .github/workflows/ci.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b3923bb..5b5ddc31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,10 +86,17 @@ jobs: - name: Install molecule and openshift dependencies run: pip install molecule yamllint openshift flake8 - - name: Install ansible base (devel branch) + - name: Install ansible base (2.10 branch) run: | pip uninstall -y ansible - pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check + pip install https://github.com/ansible/ansible/archive/stable-2.10.tar.gz --disable-pip-version-check + + # The devel branch doesn't work with Molecule currently. + # See: https://github.com/ansible-community/molecule/issues/2757 + # - name: Install ansible base (devel branch) + # run: | + # pip uninstall -y ansible + # pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check - name: Create default collection path symlink run: | From bab4e387389b7614c104d373e779067bdfc1f70b Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Thu, 23 Jul 2020 11:15:35 -0500 Subject: [PATCH 5/6] Issue #167: Install ansible-base via pip with --pre. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b5ddc31..8e2e4f07 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,10 +86,10 @@ jobs: - name: Install molecule and openshift dependencies run: pip install molecule yamllint openshift flake8 - - name: Install ansible base (2.10 branch) + - name: Install ansible base, latest release. run: | pip uninstall -y ansible - pip install https://github.com/ansible/ansible/archive/stable-2.10.tar.gz --disable-pip-version-check + pip install --pre ansible-base # The devel branch doesn't work with Molecule currently. # See: https://github.com/ansible-community/molecule/issues/2757 From 0473ac9fcc8a8f7d4d94d1db8d2ecf3ad8fd75c9 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Thu, 23 Jul 2020 11:22:35 -0500 Subject: [PATCH 6/6] Issue #167: Try Ansible's stable release. --- .github/workflows/ci.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e2e4f07..f28eef96 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,12 +84,14 @@ jobs: python-version: ${{ matrix.python_version }} - name: Install molecule and openshift dependencies - run: pip install molecule yamllint openshift flake8 + run: pip install ansible molecule yamllint openshift flake8 - - name: Install ansible base, latest release. - run: | - pip uninstall -y ansible - pip install --pre ansible-base + # The latest release doesn't work with Molecule currently. + # See: https://github.com/ansible-community/molecule/issues/2757 + # - name: Install ansible base, latest release. + # run: | + # pip uninstall -y ansible + # pip install --pre ansible-base # The devel branch doesn't work with Molecule currently. # See: https://github.com/ansible-community/molecule/issues/2757