From 9eddd1f4e3de49e81419ef82b9813ee9861c1ae9 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 3 Oct 2021 16:32:58 +0200 Subject: [PATCH] feat: add test for Rocky Linux 8 --- .drone.jsonnet | 6 +++--- .drone.yml | 10 ++++++---- molecule/default | 2 +- molecule/{centos8 => rocky8}/converge.yml | 1 - molecule/{centos8 => rocky8}/create.yml | 0 molecule/{centos8 => rocky8}/destroy.yml | 0 molecule/{centos8 => rocky8}/molecule.yml | 4 ++-- molecule/{centos8 => rocky8}/prepare.yml | 0 molecule/{centos8 => rocky8}/tests/test_default.py | 0 9 files changed, 12 insertions(+), 11 deletions(-) rename molecule/{centos8 => rocky8}/converge.yml (82%) rename molecule/{centos8 => rocky8}/create.yml (100%) rename molecule/{centos8 => rocky8}/destroy.yml (100%) rename molecule/{centos8 => rocky8}/molecule.yml (91%) rename molecule/{centos8 => rocky8}/prepare.yml (100%) rename molecule/{centos8 => rocky8}/tests/test_default.py (100%) diff --git a/.drone.jsonnet b/.drone.jsonnet index 4e00da4..439fb8e 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -71,7 +71,7 @@ local PipelineDeployment(scenario='centos7') = { 'linting', ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**'], + ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], }, }; @@ -116,7 +116,7 @@ local PipelineDocumentation = { }, depends_on: [ 'testing-centos7', - 'testing-centos8', + 'testing-rocky8', ], }; @@ -155,7 +155,7 @@ local PipelineNotification = { [ PipelineLinting, PipelineDeployment(scenario='centos7'), - PipelineDeployment(scenario='centos8'), + PipelineDeployment(scenario='rocky8'), PipelineDocumentation, PipelineNotification, ] diff --git a/.drone.yml b/.drone.yml index dbc462e..d85a969 100644 --- a/.drone.yml +++ b/.drone.yml @@ -62,13 +62,14 @@ trigger: ref: - refs/heads/master - refs/tags/** + - refs/pull/** depends_on: - linting --- kind: pipeline -name: testing-centos8 +name: testing-rocky8 platform: os: linux @@ -85,7 +86,7 @@ steps: - name: ansible-molecule image: thegeeklab/molecule:3 commands: - - molecule test -s centos8 + - molecule test -s rocky8 environment: HCLOUD_TOKEN: from_secret: hcloud_token @@ -94,6 +95,7 @@ trigger: ref: - refs/heads/master - refs/tags/** + - refs/pull/** depends_on: - linting @@ -140,7 +142,7 @@ trigger: depends_on: - testing-centos7 - - testing-centos8 + - testing-rocky8 --- kind: pipeline @@ -180,6 +182,6 @@ depends_on: --- kind: signature -hmac: 89fa12b25e5aa010768bc8ea02700029aaa36579a4145cc93b9982cf99f0294a +hmac: 3409b2e76d22507fa427d47be3e09feb90213e4dee62250800e13b5c0e93c7c4 ... diff --git a/molecule/default b/molecule/default index 575742e..62ea184 120000 --- a/molecule/default +++ b/molecule/default @@ -1 +1 @@ -centos8 \ No newline at end of file +rocky8 \ No newline at end of file diff --git a/molecule/centos8/converge.yml b/molecule/rocky8/converge.yml similarity index 82% rename from molecule/centos8/converge.yml rename to molecule/rocky8/converge.yml index 0f73721..d3cd455 100644 --- a/molecule/centos8/converge.yml +++ b/molecule/rocky8/converge.yml @@ -2,7 +2,6 @@ - name: Converge hosts: all vars: - ansible_python_interpreter: /usr/libexec/platform-python smb_shares: - name: multimedia source: //share.example.com/media diff --git a/molecule/centos8/create.yml b/molecule/rocky8/create.yml similarity index 100% rename from molecule/centos8/create.yml rename to molecule/rocky8/create.yml diff --git a/molecule/centos8/destroy.yml b/molecule/rocky8/destroy.yml similarity index 100% rename from molecule/centos8/destroy.yml rename to molecule/rocky8/destroy.yml diff --git a/molecule/centos8/molecule.yml b/molecule/rocky8/molecule.yml similarity index 91% rename from molecule/centos8/molecule.yml rename to molecule/rocky8/molecule.yml index 11ca6f8..add39a6 100644 --- a/molecule/centos8/molecule.yml +++ b/molecule/rocky8/molecule.yml @@ -9,8 +9,8 @@ dependency: driver: name: delegated platforms: - - name: centos8-smb - image: centos-8 + - name: rocky8-smb + image: rocky-8 server_type: cx11 lint: | /usr/local/bin/flake8 diff --git a/molecule/centos8/prepare.yml b/molecule/rocky8/prepare.yml similarity index 100% rename from molecule/centos8/prepare.yml rename to molecule/rocky8/prepare.yml diff --git a/molecule/centos8/tests/test_default.py b/molecule/rocky8/tests/test_default.py similarity index 100% rename from molecule/centos8/tests/test_default.py rename to molecule/rocky8/tests/test_default.py