From b52a74b2d9a625407765c1ab84336652a6dc9d39 Mon Sep 17 00:00:00 2001 From: apiyo Date: Fri, 3 May 2024 11:31:47 +0300 Subject: [PATCH] Fix failing tests --- molecule/default/molecule.yml | 6 +++--- molecule/install-only/molecule.yml | 2 ++ tasks/package.yml | 7 +++++-- tasks/source.yml | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 07031eb..ab612ad 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -15,7 +15,7 @@ platforms: privileged: true command: /sbin/init volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /sys/fs/cgroup:/sys/fs/cgroup:rw env: LC_ALL: "C.UTF-8" LANG: "C.UTF-8" @@ -24,7 +24,7 @@ platforms: privileged: true command: /sbin/init volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /sys/fs/cgroup:/sys/fs/cgroup:rw env: LC_ALL: "C.UTF-8" LANG: "C.UTF-8" @@ -33,7 +33,7 @@ platforms: privileged: true command: /sbin/init volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /sys/fs/cgroup:/sys/fs/cgroup:rw env: LC_ALL: "C.UTF-8" LANG: "C.UTF-8" diff --git a/molecule/install-only/molecule.yml b/molecule/install-only/molecule.yml index c285ab7..cc6f4e5 100644 --- a/molecule/install-only/molecule.yml +++ b/molecule/install-only/molecule.yml @@ -11,6 +11,8 @@ platforms: - name: ubuntu-16.04 image: solita/ubuntu-systemd:16.04 privileged: true + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init provisioner: name: ansible diff --git a/tasks/package.yml b/tasks/package.yml index 2687b1a..b4381b9 100644 --- a/tasks/package.yml +++ b/tasks/package.yml @@ -1,5 +1,7 @@ --- -# file: nginx/tasks/package.yml +- name: Run the equivalent of "apt-get update" as a separate step + apt: + update_cache: yes - name: Nginx | Make sure the ansible required dependencies are installed apt: @@ -7,11 +9,12 @@ - python3-pycurl - dirmngr - gnupg + - wget state: present -# make the KEY_ID a var - name: Add nginx GPG key command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ABF5BD827BD9BF62 + when: ansible_distribution_version == "22.04" - name: Add Nginx APT repository apt_repository: diff --git a/tasks/source.yml b/tasks/source.yml index 0a5e413..c1ceadb 100644 --- a/tasks/source.yml +++ b/tasks/source.yml @@ -14,6 +14,7 @@ - libpcre3-dev - libssl-dev - libssl1.1 + - wget - name: Nginx | Download the Nginx source release if not yet present get_url: