From 736d4de28a01de1c19801c7d5f151a0fa3617965 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Tue, 13 Jul 2021 15:41:08 +0100 Subject: [PATCH 1/2] ansible: fix running in check mode Allow some `uri` tasks to run in check mode. --- ansible/roles/java-base/tasks/main.yml | 1 + ansible/roles/ninja/tasks/main.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/ansible/roles/java-base/tasks/main.yml b/ansible/roles/java-base/tasks/main.yml index 3fe55f532..29f26316f 100644 --- a/ansible/roles/java-base/tasks/main.yml +++ b/ansible/roles/java-base/tasks/main.yml @@ -89,6 +89,7 @@ # to discover the most recent release for the given adoptopenjdk_version and # platform. - name: fetch adoptopenjdk metadata + check_mode: no register: adoptopenjdk_metadata uri: body_format: json diff --git a/ansible/roles/ninja/tasks/main.yml b/ansible/roles/ninja/tasks/main.yml index 2845aba1e..a56ef75ad 100644 --- a/ansible/roles/ninja/tasks/main.yml +++ b/ansible/roles/ninja/tasks/main.yml @@ -8,6 +8,7 @@ ansible.builtin.uri: return_content: yes url: https://api.github.com/repos/ninja-build/ninja/releases/latest + check_mode: no register: ninja_latest # Tag in GitHub is prefixed with 'v' but the output from `ninja --version` is not. From b43b19d222e9bae5d6e33a9d5f77ea18e700979c Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Tue, 13 Jul 2021 15:41:54 +0100 Subject: [PATCH 2/2] ansible: install `glib2-devel` on centos7-ppc64 V8 CI needs `glib2-devel` installed. --- ansible/roles/baselayout/vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index b38da8937..ee48acdda 100644 --- a/ansible/roles/baselayout/vars/main.yml +++ b/ansible/roles/baselayout/vars/main.yml @@ -42,7 +42,7 @@ packages: { # partials/repo/centos7.yml for arm64 centos7_arm64: ['git,python3'], # git2u not available for aarch64 (yet) centos7_x64: ['devtoolset-6-libatomic-devel,git222,centos-release-scl,python3'], - centos7_ppc64: ['cmake3,devtoolset-6-libatomic-devel,git,python3'], + centos7_ppc64: ['cmake3,devtoolset-6-libatomic-devel,glib2-devel,git,python3'], centos7: [ 'bzip2-devel,openssl-devel,ccache,gcc-c++,devtoolset-6,sudo,zlib-devel,libffi-devel,devtoolset-8,devtoolset-8-libatomic-devel',