diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4720189aae01160fa29e370036d570106b169e56..04fda911a80722dabe7a88f421a696ea29f52f0e 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/meta/main.yml b/meta/main.yml index 7f6b6d8d48a036169db119624f57eae22ee9df5c..e30b63048265ddbfb27c44cc357059a653539ca0 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -17,6 +17,7 @@ galaxy_info: versions: - bionic - focal + - jammy galaxy_tags: - system dependencies: diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 54e2ab09bca49ada289b0137a8b1913f32383c0b..e54f5bc06d658320bf6158b06ac87343929a1a42 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: |