From e63e207749883c08c1dad66889486270f95d6b14 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Wed, 24 Jan 2024 20:51:42 -0600 Subject: [PATCH] fix(ci): self-hosted --- .github/workflows/cache.yml | 56 ------------------------------- .github/workflows/test.yml | 28 ---------------- Brewfile | 5 --- molecule/default/molecule.yml | 4 +-- molecule/ipv6/molecule.yml | 4 +-- molecule/single_node/molecule.yml | 4 +-- 6 files changed, 3 insertions(+), 98 deletions(-) delete mode 100644 Brewfile diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml index 9ed820e..6322657 100644 --- a/.github/workflows/cache.yml +++ b/.github/workflows/cache.yml @@ -21,32 +21,6 @@ jobs: python-version: ${{ env.PYTHON_VERSION }} cache: 'pip' # caching pip dependencies - # - name: Cache Ansible - # uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0 - # id: cache-ansible - # with: - # path: ~/.ansible/collections - # key: ansible-${{ hashFiles('collections/requirements.yml') }} - # restore-keys: | - # ansible- - - # - name: Install dependencies - # run: | - # echo "::group::Upgrade pip" - # python3 -m pip install --upgrade pip - # echo "::endgroup::" - - # echo "::group::Install Python requirements from requirements.txt" - # python3 -m pip install -r requirements.txt - # echo "::endgroup::" - - # - name: Install ansible dependencies - # if: steps.cache-ansible.outputs.cache-hit != 'true' # only run if false since this is just a cache step - # run: | - # echo "::group::Install Ansible role requirements from collections/requirements.yml" - # ansible-galaxy install -r collections/requirements.yml - # echo "::endgroup::" - - name: Cache Vagrant boxes id: cache-vagrant uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0 @@ -58,36 +32,6 @@ jobs: restore-keys: | vagrant-boxes - # - name: install apt packages - # run: | - # wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg - # echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list - # sudo apt update && sudo apt -y install vagrant virtualbox - - - # - name: Configure Homebrew cache - # uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0 - # id: cache-homebrew - # with: - # path: | - # ~/Library/Caches/Homebrew - # key: brew-${{ hashFiles('./Brewfile') }} - # restore-keys: brew- - - # - name: Update Homebrew - # if: | # only run if false since this is just a cache step - # steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-vagrant.outputs.cache-hit != 'true' - # run: | - # brew update --preinstall - - # - name: Install Homebrew dependencies - # if: | # only run if false since this is just a cache step - # steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-cache-vagrant.outputs.cache-hit != 'true' - # run: | - # env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade --file ./Brewfile - # vagrant --version - # vboxmanage --version - - name: Download Vagrant boxes for all scenarios # To save some cache space, all scenarios share the same cache key. # On the other hand, this means that the cache contents should be diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d5de0d0..f55bf48 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,11 +22,6 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - # - name: Restore Ansible cache - # uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0 - # with: - # path: ~/.ansible/collections - # key: ansible-${{ hashFiles('collections/requirements.yml') }} - name: Configure VirtualBox run: |- sudo mkdir -p /etc/vbox @@ -41,29 +36,6 @@ jobs: python-version: ${{ env.PYTHON_VERSION }} cache: 'pip' # caching pip dependencies - # - name: Restore Homebrew cache - # uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0 - # with: - # path: | - # ~/Library/Caches/Homebrew - # key: brew-${{ hashFiles('./Brewfile') }} - - # - name: Update Homebrew - # run: | - # brew update --preinstall - - # - name: Install Homebrew dependencies - # run: | - # env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade --file ./Brewfile - # vagrant --version - # vboxmanage --version - - # - name: install apt packages - # run: | - # wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg - # echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list - # sudo apt update && sudo apt -y install vagrant virtualbox - - name: Restore vagrant Boxes cache uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0 with: diff --git a/Brewfile b/Brewfile deleted file mode 100644 index a391ade..0000000 --- a/Brewfile +++ /dev/null @@ -1,5 +0,0 @@ -tap "homebrew/bundle" -tap "hashicorp/tap" - -cask "virtualbox" -cask "vagrant" diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 5f4de6e..98d0d2e 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -1,8 +1,6 @@ --- dependency: name: galaxy - options: - requirements-file: collections/requirements.yml driver: name: vagrant platforms: @@ -75,7 +73,7 @@ platforms: provisioner: name: ansible env: - ANSIBLE_VERBOSITY: 3 + ANSIBLE_VERBOSITY: 1 playbooks: converge: ../resources/converge.yml side_effect: ../resources/reset.yml diff --git a/molecule/ipv6/molecule.yml b/molecule/ipv6/molecule.yml index f662411..3d45b25 100644 --- a/molecule/ipv6/molecule.yml +++ b/molecule/ipv6/molecule.yml @@ -1,8 +1,6 @@ --- dependency: name: galaxy - options: - requirements-file: collections/requirements.yml driver: name: vagrant platforms: @@ -56,7 +54,7 @@ platforms: provisioner: name: ansible env: - ANSIBLE_VERBOSITY: 3 + ANSIBLE_VERBOSITY: 1 playbooks: converge: ../resources/converge.yml side_effect: ../resources/reset.yml diff --git a/molecule/single_node/molecule.yml b/molecule/single_node/molecule.yml index 7fa04ab..0a77896 100644 --- a/molecule/single_node/molecule.yml +++ b/molecule/single_node/molecule.yml @@ -1,8 +1,6 @@ --- dependency: name: galaxy - options: - requirements-file: collections/requirements.yml driver: name: vagrant platforms: @@ -24,7 +22,7 @@ platforms: provisioner: name: ansible env: - ANSIBLE_VERBOSITY: 3 + ANSIBLE_VERBOSITY: 1 playbooks: converge: ../resources/converge.yml side_effect: ../resources/reset.yml