From 448470e11b8cddaa083995c016fa794999276b9f Mon Sep 17 00:00:00 2001 From: Sonny Kieu Date: Thu, 8 May 2025 13:32:17 +1000 Subject: [PATCH 1/5] [DEVOPS-81] Added shipshape check for PaaS to check for Gitlab CI inclusion. --- .gitlab-ci-main.yml | 2 +- shipshape.paas.yml | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 shipshape.paas.yml diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 5829c4f0..923eff7b 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -135,7 +135,7 @@ shipshape: - tests/shipshape-results.xml when: always script: - - shipshape -f /govcms/shipshape.yml --exclude-db --error-code -o junit > tests/shipshape-results.xml + - shipshape -f /govcms/shipshape.yml -f /govcms/shipshape.paas.yml --exclude-db --error-code -o junit > tests/shipshape-results.xml when: on_success allow_failure: true after_script: diff --git a/shipshape.paas.yml b/shipshape.paas.yml new file mode 100644 index 00000000..951fe6cc --- /dev/null +++ b/shipshape.paas.yml @@ -0,0 +1,15 @@ +# Shipshape checks specifically for PaaS. +checks: + yaml: + - name: "PaaS Gitlab CI file" + severity: low + file: .gitlab-ci.yml + ignore-missing: true + optional: true + values: + - key: include.project + value: 'govcms/scaffold-tooling' + - key: include.file + value: '.gitlab-ci-main.yml' + - key: include.ref + value: '5.4.0' From b9c226b6f8b8122cb1bc2808e66d6c1e729870ed Mon Sep 17 00:00:00 2001 From: Sonny Kieu Date: Thu, 8 May 2025 14:25:57 +1000 Subject: [PATCH 2/5] Updated shipshape command. --- .gitlab-ci-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 923eff7b..e8ca1ee0 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -135,7 +135,7 @@ shipshape: - tests/shipshape-results.xml when: always script: - - shipshape -f /govcms/shipshape.yml -f /govcms/shipshape.paas.yml --exclude-db --error-code -o junit > tests/shipshape-results.xml + - shipshape run . -f /govcms/shipshape.yml -f /govcms/shipshape.paas.yml --exclude-db --error-code -o junit > tests/shipshape-results.xml when: on_success allow_failure: true after_script: From 1dfd708d2df6bab68a9c7e3a7b2e4288a949658a Mon Sep 17 00:00:00 2001 From: Sonny Kieu Date: Thu, 8 May 2025 15:09:16 +1000 Subject: [PATCH 3/5] Copied PaaS Shipshape config to CI. --- .gitlab-ci-main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index e8ca1ee0..43f53f12 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -135,6 +135,7 @@ shipshape: - tests/shipshape-results.xml when: always script: + - cp shipshape.paas.yml /govcms/shipshape.paas.yml - shipshape run . -f /govcms/shipshape.yml -f /govcms/shipshape.paas.yml --exclude-db --error-code -o junit > tests/shipshape-results.xml when: on_success allow_failure: true From 99ce7eeb33a968bacfaf716469523af3e995b3b7 Mon Sep 17 00:00:00 2001 From: Sonny Kieu Date: Thu, 8 May 2025 15:20:22 +1000 Subject: [PATCH 4/5] Copied PaaS Shipshape config to CI. --- .gitlab-ci-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 43f53f12..f9d44771 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -135,7 +135,7 @@ shipshape: - tests/shipshape-results.xml when: always script: - - cp shipshape.paas.yml /govcms/shipshape.paas.yml + - cp "${CI_PROJECT_DIR}/shipshape.paas.yml" /govcms/shipshape.paas.yml - shipshape run . -f /govcms/shipshape.yml -f /govcms/shipshape.paas.yml --exclude-db --error-code -o junit > tests/shipshape-results.xml when: on_success allow_failure: true From 72cde906fcd14272515607c581c1c65925873c7a Mon Sep 17 00:00:00 2001 From: Sonny Kieu Date: Thu, 8 May 2025 16:03:00 +1000 Subject: [PATCH 5/5] Move PaaS Shipshape config to GovCMS CI image. --- .gitlab-ci-main.yml | 1 - shipshape.paas.yml | 15 --------------- 2 files changed, 16 deletions(-) delete mode 100644 shipshape.paas.yml diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index f9d44771..e8ca1ee0 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -135,7 +135,6 @@ shipshape: - tests/shipshape-results.xml when: always script: - - cp "${CI_PROJECT_DIR}/shipshape.paas.yml" /govcms/shipshape.paas.yml - shipshape run . -f /govcms/shipshape.yml -f /govcms/shipshape.paas.yml --exclude-db --error-code -o junit > tests/shipshape-results.xml when: on_success allow_failure: true diff --git a/shipshape.paas.yml b/shipshape.paas.yml deleted file mode 100644 index 951fe6cc..00000000 --- a/shipshape.paas.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Shipshape checks specifically for PaaS. -checks: - yaml: - - name: "PaaS Gitlab CI file" - severity: low - file: .gitlab-ci.yml - ignore-missing: true - optional: true - values: - - key: include.project - value: 'govcms/scaffold-tooling' - - key: include.file - value: '.gitlab-ci-main.yml' - - key: include.ref - value: '5.4.0'