build(version): bump version 0.1.1rc0 → 0.1.1rc1

Merge branch 'fix-non-urgent' into 'development'
fix: manual update See merge request nofusscomputing/projects/ansible/execution_environment!28
2023-06-05 03:31:28 +00:00 · 2023-06-05 02:44:43 +00:00 · 2023-06-05 12:12:11 +09:30 · 2023-06-05 12:11:47 +09:30 · 2023-06-05 02:38:18 +00:00 · 2023-06-05 02:36:51 +00:00
12 changed files with 65 additions and 34 deletions
--- a/.cz.yaml
+++ b/.cz.yaml
@ -4,4 +4,4 @@ commitizen:
  name: cz_conventional_commits
  tag_format: $major.$minor.$patch$prerelease
  update_changelog_on_bump: true
-  version: 0.1.1rc0
+  version: 0.1.1rc1
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -10,13 +10,11 @@ variables:
  DOCKER_IMAGE_PUBLISH_URL: https://hub.docker.com/r/nofusscomputing/$DOCKER_IMAGE_PUBLISH_NAME


-
 include:
  - project: nofusscomputing/projects/gitlab-ci
    ref: development
    file:
-      - .gitlab-ci_common.yaml
-      - template/docker-image.gitlab-ci.yaml
+      - template/automagic.gitlab-ci.yaml
  #- template: Jobs/Container-Scanning.gitlab-ci.yml # see https://gitlab.com/gitlab-org/gitlab/-/issues/381665


--- a/.gitmodules
+++ b/.gitmodules
@ -2,3 +2,11 @@
 	path = gitlab-ci
 	url = https://gitlab.com/nofusscomputing/projects/gitlab-ci.git
 	branch = development
+[submodule "ansible-roles"]
+	path = includes/etc/ansible/roles
+	url = https://gitlab.com/nofusscomputing/projects/ansible/ansible-roles.git
+	branch = development
+[submodule "ansible_playbooks"]
+	path = includes/etc/ansible/playbooks
+	url = https://gitlab.com/nofusscomputing/projects/ansible/ansible_playbooks.git
+	branch = development
--- a/.nfc_automation.yaml
+++ b/.nfc_automation.yaml
@ -0,0 +1,8 @@
+---
+
+role_git_conf:
+  gitlab:
+    submodule_branch: "development"
+    default_branch: development
+    mr_labels: ~"type::automation" ~"impact::0" ~"priority::0"
+    auto_merge: true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,25 @@
+## 0.1.1rc1 (2023-06-05)
+
+### Bug Fixes
+
+- **python**: [e82f96a4](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/e82f96a40269b42a5421360724e93768b2958bdb) - linked ansible used python to 3.11 [ [#9](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/issues/9) [!24](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/24) [#22](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/issues/22) [!27](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/27) [#9](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/issues/9) ]
+- **git_config**: [318a91ce](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/318a91ce6d7bd08ff7bde514b33a13a01235afc6) - again! ensure cloned ansible-roles has submodules init [ [!9](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/9) ]
+- **git_config**: [30797b45](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/30797b4577589c39eed0ae63ce2df37f9920f2a8) - ensure cloned ansible-roles has submodules init [ [!8](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/8) ]
+
+### Code Refactor
+
+- **build**: [e2852ebe](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/e2852ebe292bc838d95048515a8dca0d93ccbc24) - other projects included as git submodule [ [!15](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/15) [#74](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/issues/74) ]
+- **playbooks**: [07cdde82](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/07cdde820a6b42e607966257c373239bb1b20ccb) - seperated git clone to own run [ [!11](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/11) [#7](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/issues/7) [!1](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/1) [#1](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/issues/1) ]
+
+### Features
+
+- **ansible**: [a1e3a0c6](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/a1e3a0c656897c28c7d778ead46dac11e9edf5aa) - ansible.cfg added workdir roles [ [!28](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/28) ]
+- **ansible**: [369987ea](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/369987eaf5755c193b9d1fd53f614799139acdd4) - add galaxy collection community.docker [ [!24](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/24) [#22](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/issues/22) [!27](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/27) ]
+- **ansible**: [e48800bf](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/e48800bf8ea2922a37992770a9b63ea6ca425cd4) - add galaxy collection ansible.posix [ [!24](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/24) [#22](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/issues/22) [!27](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/27) ]
+- **ci**: [6b785d0c](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/6b785d0c532d432c4f88387c13d12d3870a71d04) - use project gitlab-ci automagic template [ [!12](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/12) ]
+- **playbooks**: [1da35d57](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/1da35d57709480ecde0573a33647f8dcb17ebffb) - add nfc ansible playbooks to image [ [!11](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/11) [#7](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/issues/7) [!1](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/1) [#1](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/issues/1) ]
+- **module**: [24a65b4d](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/24a65b4d99876c1bf09da81bab7a1942b32f2dd1) - add collection community.general [ [!10](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/10) ]
+
 ## 0.1.1rc0 (2023-05-23)

 ### Bug Fixes
--- a/ansible.cfg
+++ b/ansible.cfg
@ -1,4 +0,0 @@
-[defaults]
-collections_path=/etc/ansible/collections
-roles_path=/etc/ansible/roles
-log_path=/ansible.log
--- a/40
+++ b/40
@ -1,29 +1,13 @@
-FROM --platform=$BUILDPLATFORM python:3.11-bullseye as fetch-ansible-roles
-
-
-ENV LC_ALL en_US.UTF-8
-
-
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && dpkg-reconfigure debconf -f noninteractive
-
-
-RUN apt update \
-  && apt install --reinstall -yq \
-    git || true
-
-
-RUN git clone -b development --depth 1 https://gitlab.com/nofusscomputing/projects/ansible-roles.git /tmp/ansible-roles 
-
-
-
 FROM --platform=$TARGETPLATFORM python:3.11-bullseye

 # Ansible chucks a wobbler without. see: https://github.com/ansible/ansible/issues/78283
 ENV LC_ALL en_US.UTF-8

+ENV ANSIBLE_PLAYBOOK_DIR=/etc/ansible/playbooks
+
+
+COPY includes /

-COPY --from=fetch-ansible-roles /tmp/ansible-roles/roles /etc/ansible/roles

 # Ref: https://github.com/opencontainers/image-spec/blob/d86384efdb8c30770a92415c100f57a9bffbb64e/annotations.md
 LABEL \
@ -60,15 +44,15 @@ RUN export DEBIAN_FRONTEND=noninteractive \
  && mkdir -p /etc/ansible/roles \
  && mkdir -p /etc/ansible/collections \
  && mkdir -p /workdir \
-  && apt list --installed
+  && apt list --installed \
+    # see issue https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/issues/9 for following two lines
+  && rm /usr/bin/python3 \
+  && ln -s /usr/local/bin/python3.11 /usr/bin/python3


 WORKDIR /workdir


-COPY ansible.cfg /etc/ansible/ansible.cfg
-
-
 COPY requirements.txt /tmp/requirements.txt


@ -79,4 +63,10 @@ RUN pip install --index-url https://gitlab.com/api/v4/projects/45741845/packages

 RUN ansible-galaxy collection install \
    awx.awx \
-    kubernetes.core
+    kubernetes.core \
+    # community.general.gitlab_*
+    community.general \
+    # ansible.posix.authorized_key for SSH
+    ansible.posix \
+    # docker managment
+    community.docker
--- a/2
+++ b/2
--- a/includes/etc/ansible/ansible.cfg
+++ b/includes/etc/ansible/ansible.cfg
@ -0,0 +1,4 @@
+[defaults]
+collections_path=/etc/ansible/collections
+roles_path=/etc/ansible/roles:/workdir/roles:/workdir/ansible-roles
+log_path=/ansible.log
--- a/includes/etc/ansible/playbooks
+++ b/includes/etc/ansible/playbooks
--- a/includes/etc/ansible/roles
+++ b/includes/etc/ansible/roles
--- a/requirements.txt
+++ b/requirements.txt
@ -1,2 +1,5 @@
 ansible-core==2.14.5
 ansible-lint==6.15.0
+
+# Required for community.general.gitlab_*
+python_gitlab==3.14.0
Author	SHA1	Message	Date
nfc_bot	cc1c073a64	build(version): bump version 0.1.1rc0 → 0.1.1rc1	2023-06-05 03:31:28 +00:00
Jon	a2d6baf705	Merge branch 'fix-non-urgent' into 'development' fix: manual update See merge request nofusscomputing/projects/ansible/execution_environment!28	2023-06-05 02:44:43 +00:00
Jon	5a90438f8c	chore(git): update all to current HEAD !28	2023-06-05 12:12:11 +09:30
Jon	a1e3a0c656	feat(ansible): ansible.cfg added workdir roles !28	2023-06-05 12:11:47 +09:30
No Fuss Computing Bot	ea2e336aac	Merge branch 'automated-tasks' into 'development' chore(git): Automated update of git sub-modules See merge request nofusscomputing/projects/ansible/execution_environment!26	2023-06-05 02:38:18 +00:00
nfc_bot	ba3b32dc47	chore(git): updated submodule gitlab-ci Automation Data: { "branch": "development", "current_commit": "6201afaf7e82411af1d0d173d54dffe1d404544a", "name": "gitlab-ci", "path": "/builds/nofusscomputing/projects/ansible/execution_environment/_automation_/gitlab-ci", "remote_head": "1e21ff27098444206cbb9309ef95fc64d730f26d", "remote_name": "", "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git" } Changes: Submodule path gitlab-ci: checked out 1e21ff27098444206cbb9309ef95fc64d730f26d MR !26	2023-06-05 02:36:51 +00:00
Jon	b4f08f2995	Merge branch 'fix-non-urgent' into 'development' fix: non urgent See merge request nofusscomputing/projects/ansible/execution_environment!24	2023-06-05 02:26:59 +00:00
Jon	e82f96a402	fix(python): linked ansible used python to 3.11 see nofusscomputing/projects/ansible/execution_environment#9 for issue WRT the python version !24 nofusscomputing/infrastructure/config#22 nofusscomputing/infrastructure/config!27 nofusscomputing/projects/ansible/execution_environment#9	2023-06-05 09:56:50 +09:30
Jon	369987eaf5	feat(ansible): add galaxy collection community.docker this collection is required so that docker containers can be managed !24 nofusscomputing/infrastructure/config#22 nofusscomputing/infrastructure/config!27	2023-06-05 09:35:00 +09:30
Jon	e48800bf8e	feat(ansible): add galaxy collection ansible.posix this collection is required so that ssh auth_keys can be used !24 nofusscomputing/infrastructure/config#22 nofusscomputing/infrastructure/config!27	2023-06-04 14:03:44 +09:30
Jon	e146a0934e	Merge branch 'chore-submodule-update' into 'development' chore(git): update all to current HEAD See merge request nofusscomputing/projects/ansible/execution_environment!23	2023-06-03 04:42:25 +00:00
Jon	55ffc49281	chore(git): update all to current HEAD !23	2023-06-03 14:10:43 +09:30
Jon	9ee993c60e	Merge branch 'chore-submodule-update' into 'development' chore(git): update all to current HEAD See merge request nofusscomputing/projects/ansible/execution_environment!22	2023-06-03 04:11:55 +00:00
Jon	5436e2b0f0	chore(git): update all to current HEAD !22	2023-06-03 13:40:13 +09:30
Jon	ff5813903f	Merge branch 'chore-submodule-update' into 'development' chore(git): update all to current HEAD See merge request nofusscomputing/projects/ansible/execution_environment!21	2023-06-03 03:40:16 +00:00
Jon	adfe708f7c	chore(git): update all to current HEAD !21	2023-06-03 13:08:30 +09:30
Jon	085317dc81	Merge branch 'chore-submodule-update' into 'development' chore(git): update all to current HEAD See merge request nofusscomputing/projects/ansible/execution_environment!20	2023-06-03 02:08:52 +00:00
Jon	6bf1a8f334	chore(git): update all to current HEAD -!20 nofusscomputing/projects/ansible/git_configuration!62 nofusscomputing/projects/gitlab-ci!49	2023-06-03 11:36:17 +09:30
No Fuss Computing Bot	c5232b82b1	Merge branch 'automated-tasks' into 'development' chore(git): Automated update of git sub-modules See merge request nofusscomputing/projects/ansible/execution_environment!18	2023-06-01 06:25:32 +00:00
nfc_bot	7de7efaab8	chore(git): updated submodule includes/etc/ansible/roles Automation Data: { "branch": "development", "current_commit": "f361c09aca8925a281600ce8047c76111e90eaf8", "name": "includes/etc/ansible/roles", "path": "/builds/nofusscomputing/projects/ansible/execution_environment/_automation_/includes/etc/ansible/roles", "remote_head": "21b1049089540b3bacc97c34d2d0b10be7a83070", "remote_name": "", "url": "https://gitlab.com/nofusscomputing/projects/ansible/ansible-roles.git" } Changes: Submodule path includes/etc/ansible/roles: checked out 21b1049089540b3bacc97c34d2d0b10be7a83070 MR !18	2023-06-01 06:15:17 +00:00
No Fuss Computing Bot	eb9326f371	Merge branch 'automated-tasks' into 'development' chore(git): Automated update of git sub-modules See merge request nofusscomputing/projects/ansible/execution_environment!17	2023-06-01 05:43:37 +00:00
nfc_bot	51ef1528da	chore(git): updated submodule includes/etc/ansible/playbooks Automation Data: { "branch": "development", "current_commit": "bf16a59207fc9bfe34b524a378b768b228ed0919", "name": "includes/etc/ansible/playbooks", "path": "/builds/nofusscomputing/projects/ansible/execution_environment/_automation_/includes/etc/ansible/playbooks", "remote_head": "0defc58bd4fb865ed08d1818e1808ec214963aa7", "remote_name": "", "url": "https://gitlab.com/nofusscomputing/projects/ansible/ansible_playbooks.git" } Changes: Submodule path includes/etc/ansible/playbooks: checked out 0defc58bd4fb865ed08d1818e1808ec214963aa7 MR !17	2023-06-01 05:33:33 +00:00
No Fuss Computing Bot	86e38ce4ef	Merge branch 'automated-tasks' into 'development' chore(git): Automated update of git sub-modules See merge request nofusscomputing/projects/ansible/execution_environment!16	2023-06-01 05:32:12 +00:00
nfc_bot	1b3c6ee7db	chore(git): updated submodule gitlab-ci Automation Data: { "branch": "development", "current_commit": "b3c84836771453744fa4bac9d739199fe0ec1160", "name": "gitlab-ci", "path": "/builds/nofusscomputing/projects/ansible/execution_environment/_automation_/gitlab-ci", "remote_head": "6a2266177bd6393384fb233933c898e3fbe5d86b", "remote_name": "", "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git" } Changes: Submodule path gitlab-ci: checked out 6a2266177bd6393384fb233933c898e3fbe5d86b MR !16	2023-06-01 05:22:07 +00:00
Jon	3cc035721a	Merge branch 'ansible-roles-restructure-ops-74' into 'development' refactor: ansible roles See merge request nofusscomputing/projects/ansible/execution_environment!15	2023-06-01 05:01:25 +00:00
Jon	e2852ebe29	refactor(build): other projects included as git submodule this was done so that any rebuild due to submodule update could be tracked and viewable within the history. !15 nofusscomputing/ops#74	2023-06-01 14:20:51 +09:30
No Fuss Computing Bot	b713b3e6b7	Merge branch 'automated-tasks' into 'development' chore(git): Automated update of git sub-modules See merge request nofusscomputing/projects/ansible/execution_environment!14	2023-06-01 03:11:48 +00:00
nfc_bot	8379ecbf67	chore(git): updated submodule gitlab-ci Automation Data: { "branch": "development", "current_commit": "2b57d0b1600025879bcf102d93cc476324b45f86", "name": "gitlab-ci", "path": "/builds/nofusscomputing/projects/ansible/execution_environment/_automation_/gitlab-ci", "remote_head": "b3c84836771453744fa4bac9d739199fe0ec1160", "remote_name": "origin", "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git" } Changes: Submodule path gitlab-ci: checked out b3c84836771453744fa4bac9d739199fe0ec1160 MR !14	2023-06-01 03:02:27 +00:00
No Fuss Computing Bot	2792f413c9	Merge branch 'automated-tasks' into 'development' chore(git): Automated update of git sub-modules See merge request nofusscomputing/projects/ansible/execution_environment!13	2023-06-01 02:54:38 +00:00
nfc_bot	31f8fd0e0f	chore(git): updated submodule gitlab-ci Automation Data: { "branch": "development", "current_commit": "e9713b31c8e5b30c27331eea23a690194f63394f", "name": "gitlab-ci", "path": "/builds/nofusscomputing/projects/ansible/execution_environment/_automation_/gitlab-ci", "remote_head": "2b57d0b1600025879bcf102d93cc476324b45f86", "remote_name": "origin", "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git" } Changes: Submodule path gitlab-ci: checked out 2b57d0b1600025879bcf102d93cc476324b45f86 MR !13	2023-06-01 02:45:22 +00:00
Jon	5bb4a209f3	Merge branch 'feat-ci-submodule' into 'development' feat: ci submodule See merge request nofusscomputing/projects/ansible/execution_environment!12	2023-06-01 02:44:32 +00:00
Jon	6b785d0c53	feat(ci): use project gitlab-ci automagic template !12	2023-06-01 12:04:40 +09:30
Jon	6dfba719cc	Merge branch 'fix-roles-git-submodules-not-included' into 'development' feat(playbooks): add nfc ansible playbooks to image Closes #7 See merge request nofusscomputing/projects/ansible/execution_environment!11	2023-05-27 04:33:23 +00:00
Jon	07cdde820a	refactor(playbooks): seperated git clone to own run !11 closes #7 nofusscomputing/projects/ansible/ansible_playbooks!1 nofusscomputing/projects/ansible/ansible_playbooks#1	2023-05-27 13:53:51 +09:30
Jon	c98427e00e	chore(git): update to current HEAD #11	2023-05-27 13:01:25 +09:30
Jon	1da35d5770	feat(playbooks): add nfc ansible playbooks to image !11 #7 nofusscomputing/projects/ansible/ansible_playbooks!1 nofusscomputing/projects/ansible/ansible_playbooks#1	2023-05-27 13:00:52 +09:30
Jon	469b99b88d	Merge branch 'fix-roles-git-submodules-not-included' into 'development' feat(module): add collection community.general See merge request nofusscomputing/projects/ansible/execution_environment!10	2023-05-26 09:49:55 +00:00
Jon	24a65b4d99	feat(module): add collection community.general this is required for the use of the community.general.gitlab_* namespace !10	2023-05-26 17:02:47 +09:30
Jon	eab21aad9e	Merge branch 'fix-roles-git-submodules-not-included' into 'development' fix(git_config): again! ensure cloned ansible-roles has submodules init See merge request nofusscomputing/projects/ansible/execution_environment!9	2023-05-26 06:13:35 +00:00
Jon	318a91ce6d	fix(git_config): again! ensure cloned ansible-roles has submodules init !9	2023-05-26 15:34:57 +09:30
Jon	9b67f9aa8d	Merge branch 'fix-roles-git-submodules-not-included' into 'development' fix(git_config): ensure cloned ansible-roles has submodules init See merge request nofusscomputing/projects/ansible/execution_environment!8	2023-05-26 05:45:48 +00:00
Jon	30797b4577	fix(git_config): ensure cloned ansible-roles has submodules init !8	2023-05-26 15:06:54 +09:30