From 72cbf89f8bb21acdc50a7a5066036d463c0241c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Sachse?= <joerg.sachse@slub-dresden.de>
Date: Tue, 29 Nov 2022 12:29:54 +0100
Subject: [PATCH] fix: skip 'no-ci' tasks in Molecule and install tools in
prepare stage instead
---
.gitlab-ci.yml | 4 ++--
molecule/resources/playbooks/converge.yml | 2 +-
molecule/resources/playbooks/prepare.yml | 9 +++++++++
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7174cad..aecb0d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,6 +30,6 @@ test-job:
- molecule syntax --scenario-name default
- molecule lint --scenario-name default
- molecule create --scenario-name default
- - molecule converge --scenario-name default
- - molecule idempotence --scenario-name default
+ - molecule converge --scenario-name default -- --skip-tags no-ci
+ - molecule idempotence --scenario-name default -- --skip-tags no-ci
# - molecule verify --scenario-name default
diff --git a/molecule/resources/playbooks/converge.yml b/molecule/resources/playbooks/converge.yml
index 5e9e9df..953cbb4 100644
--- a/molecule/resources/playbooks/converge.yml
+++ b/molecule/resources/playbooks/converge.yml
@@ -14,4 +14,4 @@
become: true
when: ansible_os_family == "RedHat"
roles:
- - {role: "ansible_lza_repair", become: true}
+ - {role: "ansible_lza_repair", become: true, skip-tags: "no-ci"}
diff --git a/molecule/resources/playbooks/prepare.yml b/molecule/resources/playbooks/prepare.yml
index 0db49d6..f03054f 100644
--- a/molecule/resources/playbooks/prepare.yml
+++ b/molecule/resources/playbooks/prepare.yml
@@ -27,6 +27,15 @@
mode: "0644"
become: true
when: ansible_os_family == "Debian"
+ - name: install tooling before running the actual tests, so we're not bound by the fixed versions
+ ansible.builtin.apt:
+ name: [
+ "checkit-tiff*",
+ "fixit-tiff",
+ ]
+ state: latest
+ update_cache: true
+ become: true
- name: configure additional package repositories for RedHat
block:
--
GitLab