From fe6b84cf28f845162714569749a2ef82b95647ea Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 23 May 2023 12:52:36 +0930 Subject: [PATCH 1/5] feat(website): enable edit button !9 --- mkdocs.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index 01ca707..8ebdfa3 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -2,7 +2,7 @@ INHERIT: website-template/mkdocs.yml repo_name: Website repo_url: https://gitlab.com/nofusscomputing/infrastructure/website -edit_uri: '' +edit_uri: '/-/ide/project/nofusscomputing/projects/docker-mail/edit/development/-/pages/' nav: - Home: index.md @@ -27,6 +27,8 @@ nav: - Ansible Roles: projects/ansible-roles/README.md + - Docker Mail: projects/docker-mail/index.md + - Gitlab CI: projects/gitlab-ci/index.md - Python Gitlab Management: projects/python-gitlab-management/README.md -- 2.49.0 From a86b4befcc7696a00575fe8303934b5c6cd4abf8 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 23 May 2023 12:54:46 +0930 Subject: [PATCH 2/5] feat(ci): enable publishing docker-mail docs !9 nofusscomputing/projects/docker-mail!10 nofusscomputing/projects/gitlab-ci!27 --- .gitlab-ci.yml | 8 +++++++- pages/projects/docker-mail/index.md | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 pages/projects/docker-mail/index.md diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f68779c..6fc8207 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,7 +57,6 @@ Assemble Site: - cp -rvf "$CI_PROJECT_DIR/artifacts/build/Website.Build/build/operations" "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME/build/" - rm -Rf "$CI_PROJECT_DIR/artifacts/build/Website.Build" - - echo "[DEBUG] fetch gitlab-ci project docs" - 'curl --location --output gitlab-ci-artifacts.zip --header "PRIVATE-TOKEN: ${GIT_COMMIT_TOKEN}" "https://gitlab.com/api/v4/projects/28543717/jobs/artifacts/development/download?job=Website%2EBuild"' - unzip gitlab-ci-artifacts.zip @@ -65,6 +64,13 @@ Assemble Site: - cp -rvf "$CI_PROJECT_DIR/artifacts/build/Website.Build/build/projects/gitlab-ci" "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME/build/projects/gitlab-ci/" - rm -Rf "$CI_PROJECT_DIR/artifacts/build/Website.Build" + - echo "[DEBUG] fetch docker-mail project docs" + - 'curl --location --output docker-mail-artifacts.zip --header "PRIVATE-TOKEN: ${GIT_COMMIT_TOKEN}" "https://gitlab.com/api/v4/projects/33611657/jobs/artifacts/development/download?job=Website%2EBuild"' + - unzip docker-mail-artifacts.zip + - rm -Rf "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME/build/projects/docker-mail" + - cp -rvf "$CI_PROJECT_DIR/artifacts/build/Website.Build/build/projects/docker-mail" "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME/build/projects/docker-mail/" + - rm -Rf "$CI_PROJECT_DIR/artifacts/build/Website.Build" + # # below 2 lines commented out as need to ffigure out how to download artifacts. # - rm -Rf "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME/build/operations/index.html" diff --git a/pages/projects/docker-mail/index.md b/pages/projects/docker-mail/index.md new file mode 100644 index 0000000..1e95b0a --- /dev/null +++ b/pages/projects/docker-mail/index.md @@ -0,0 +1,5 @@ +# Docker E-Mail Server + +| :red_circle: This page is a placeholder for the ansible-roles repo's docs. | +|:---| +| _If you can see this page there has been an error, please report the issue on gitlab_ | -- 2.49.0 From 6ed8e5bae3159ad9575f8c630bf34cf2f42214b1 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 23 May 2023 13:05:29 +0930 Subject: [PATCH 3/5] fix(ci): only deploy when assemble site success !9 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6fc8207..5971d6f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,7 +123,7 @@ pages: - public rules: - if: '$CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != "master"' - when: always + when: on_success - when: never -- 2.49.0 From b5268e18638499fa14c61066ab11e44ea346deb8 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 23 May 2023 13:25:18 +0930 Subject: [PATCH 4/5] fix(unit_test): ignore gitlab ide links for alive checks !9 --- test/unit/conftest.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/test/unit/conftest.py b/test/unit/conftest.py index d4f42e2..797f0cb 100644 --- a/test/unit/conftest.py +++ b/test/unit/conftest.py @@ -89,18 +89,20 @@ class Data: url = link.get_attribute('href') - link = self.parse_url(url) + if 'gitlab.com/-/ide/project' not in url: # ignore gitlab ide links - hyperlink_source_file = {'name': source_file, 'location': link_location} + link = self.parse_url(url) - if link['url_id'] in data['hyperlinks']: + hyperlink_source_file = {'name': source_file, 'location': link_location} - data['hyperlinks'][link['url_id']]['source_files'].append(hyperlink_source_file) + if link['url_id'] in data['hyperlinks']: - else: + data['hyperlinks'][link['url_id']]['source_files'].append(hyperlink_source_file) - link['source_files'] = [ hyperlink_source_file ] - data['hyperlinks'][link['url_id']] = link + else: + + link['source_files'] = [ hyperlink_source_file ] + data['hyperlinks'][link['url_id']] = link events = [self.process_browser_log_entry(entry) for entry in self.driver.get_log('performance')] -- 2.49.0 From 35af4c7af16fcda91944d70d385da9c545545f29 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 23 May 2023 15:09:31 +0930 Subject: [PATCH 5/5] chore(git): gitlab-ci updated to current HEAD !9 nofusscomputing/projects/gitlab-ci!27 --- gitlab-ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab-ci b/gitlab-ci index 3324ce2..df2ab75 160000 --- a/gitlab-ci +++ b/gitlab-ci @@ -1 +1 @@ -Subproject commit 3324ce20029e780ffb12f21648e6f856d782eb6d +Subproject commit df2ab75e6aa25ac00a75fc5c59419af2e04b1a75 -- 2.49.0