From f976313820f385f52d2206600be796f5da269ae0 Mon Sep 17 00:00:00 2001
From: HOVINNE Jean-Francois <jean-francois.hovinne@ext.ec.europa.eu>
Date: Mon, 11 Jul 2022 14:15:55 +0200
Subject: [PATCH] feat: Add Ubuntu 22.04 support (fixes #4)
---
.gitlab-ci.yml | 2 ++
defaults/main.yml | 8 ++++----
meta/main.yml | 9 +++++----
molecule/default/molecule.yml | 21 ++++++++++++++++-----
4 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4720189..04fda91 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,8 @@
variables:
ROLE: ${CI_PROJECT_NAME}
BRANCH: ${CI_COMMIT_REF_NAME}
+ TAG: ${CI_COMMIT_TAG}
+ PUBLISH: "true"
test:
trigger:
diff --git a/defaults/main.yml b/defaults/main.yml
index 473e0e2..a8c5c1b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,10 +1,10 @@
---
-gopass_version: 1.14.0
-gopass_summon_version: 1.12.0
+gopass_version: 1.14.3
+gopass_summon_version: 1.14.3
gopass_download_url: "https://github.com/gopasspw/gopass/releases/download/v{{ gopass_version }}/gopass-{{ gopass_version }}-linux-amd64.tar.gz"
-gopass_checksum: "sha256:377b38180dbd1ae8dd698659df577235dea1f04fae2e8fb3044a6c24b69c240d"
+gopass_checksum: "sha256:3cc3f740ca0c8423d864c93f38b934507cce5cafad87f9f5aae5f57748c64546"
gopass_path: "/opt/gopass/{{ gopass_version }}"
gopass_bin: "/usr/local/bin/gopass"
gopass_summon_download_url: "https://github.com/gopasspw/gopass-summon-provider/releases/download/v{{ gopass_summon_version }}/gopass-summon-provider-{{ gopass_summon_version }}-linux-amd64.tar.gz"
-gopass_summon_checksum: "sha256:23a72384845f75737e12863dd7a3e51586f07bf4f2e7df93a005869415dcbe8f"
+gopass_summon_checksum: "sha256:5499edaceb52127f1ec748a6eacf61e438245fda3a0d31fd60a136b5781e6f32"
summon_lib_path: "/usr/local/lib/summon"
diff --git a/meta/main.yml b/meta/main.yml
index fe4df70..3319bf4 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,23 +1,24 @@
---
galaxy_info:
- name: gopass
author: ecgalaxy
description: Installs gopass - https://www.gopass.pw/
company: European Commission
license: EUPL-1.2
- min_ansible_version: 2.5
+ min_ansible_version: "2.5"
platforms:
- name: Amazon Linux 2
versions:
- all
- name: EL
versions:
- - 7
- - 8
+ - "7"
+ - "8"
- name: Ubuntu
versions:
- bionic
- focal
+ - jammy
galaxy_tags:
+ - security
- system
dependencies: []
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 54e2ab0..e54f5bc 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -5,35 +5,42 @@ driver:
name: docker
platforms:
- name: amazonlinux2-${CI_JOB_ID:-0}
- image: geerlingguy/docker-amazonlinux2-ansible:latest
+ image: code.europa.eu:4567/ecgalaxy/amazonlinux2-ansible:latest
pre_build_image: true
env:
http_proxy: "${http_proxy}"
https_proxy: "${https_proxy}"
no_proxy: "${no_proxy}"
- name: centos7-${CI_JOB_ID:-0}
- image: geerlingguy/docker-centos7-ansible:latest
+ image: code.europa.eu:4567/ecgalaxy/centos7-ansible:latest
pre_build_image: true
env:
http_proxy: "${http_proxy}"
https_proxy: "${https_proxy}"
no_proxy: "${no_proxy}"
- name: rockylinux8-${CI_JOB_ID:-0}
- image: geerlingguy/docker-rockylinux8-ansible:latest
+ image: code.europa.eu:4567/ecgalaxy/rockylinux8-ansible:latest
pre_build_image: true
env:
http_proxy: "${http_proxy}"
https_proxy: "${https_proxy}"
no_proxy: "${no_proxy}"
- name: ubuntu1804-${CI_JOB_ID:-0}
- image: geerlingguy/docker-ubuntu1804-ansible:latest
+ image: code.europa.eu:4567/ecgalaxy/ubuntu1804-ansible:latest
pre_build_image: true
env:
http_proxy: "${http_proxy}"
https_proxy: "${https_proxy}"
no_proxy: "${no_proxy}"
- name: ubuntu2004-${CI_JOB_ID:-0}
- image: geerlingguy/docker-ubuntu2004-ansible:latest
+ image: code.europa.eu:4567/ecgalaxy/ubuntu2004-ansible:latest
+ pre_build_image: true
+ env:
+ http_proxy: "${http_proxy}"
+ https_proxy: "${https_proxy}"
+ no_proxy: "${no_proxy}"
+ - name: ubuntu2204-${CI_JOB_ID:-0}
+ image: code.europa.eu:4567/ecgalaxy/ubuntu2204-ansible:latest
pre_build_image: true
env:
http_proxy: "${http_proxy}"
@@ -41,6 +48,10 @@ platforms:
no_proxy: "${no_proxy}"
provisioner:
name: ansible
+ inventory:
+ group_vars:
+ all:
+ ansible_user: ansible
verifier:
name: ansible
lint: |
--
GitLab