From cb563115693891fa32bfb3a639df3894b65858af Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Wed, 4 Sep 2024 14:35:31 +0300 Subject: [PATCH 1/8] Add issue template for doing recurrent billing work --- .../08_collet-billing-data.yaml | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/08_collet-billing-data.yaml diff --git a/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml b/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml new file mode 100644 index 0000000000..65bb549529 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml @@ -0,0 +1,44 @@ +name: "💳 Collect billing data for a time period" +description: "Generate the billing data for a specific time period for all 2i2c clusters" +title: "[Billing] Collect billing data for {{ Month(s) }} - {{ Dedicated / Shared }} clusters" +labels: ["billing"] +body: + - type: markdown + attributes: + value: | + This template is designed to help the engineers plan the recurrent task + of generating and collecting in one place the billing data either for + shared or for dedicated 2i2c clusters for a specific time interval. + + Once all the info has been filled in, this issue is considered to be + fully refined and can be added to the `Refined` column of the Project + Board. + + # Context + + - type: dropdown + id: cluster_type + attributes: + label: Instructions for performing this task + options: + - Dedicated clusters [instructions](https://infrastructure.2i2c.org/howto/bill/#communities-with-dedicated-cloud-accounts) + - Shared clusters [instructions](https://infrastructure.2i2c.org/howto/bill/#communities-in-shared-cloud-accounts) + validations: + required: true + + - type: markdown + attributes: + value: | + # Definition of Done + + Once these are done, the issue can be considered complete and can be + closed. + + - type: markdown + attributes: + value: | + ```[tasklist] + - [ ] Billing data is collected according to instructions. + - [ ] The #billing slack was notified about the new billing data + collected + ``` From e4687eccdcf9e184a73aedf3d1e31349fde86089 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Wed, 4 Sep 2024 14:41:09 +0300 Subject: [PATCH 2/8] Keep everything in the same section --- .github/ISSUE_TEMPLATE/08_collet-billing-data.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml b/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml index 65bb549529..32f2b79be1 100644 --- a/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml +++ b/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml @@ -34,9 +34,6 @@ body: Once these are done, the issue can be considered complete and can be closed. - - type: markdown - attributes: - value: | ```[tasklist] - [ ] Billing data is collected according to instructions. - [ ] The #billing slack was notified about the new billing data From 27c1fce5ca106462d8051297cb8d827aa64310e2 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Wed, 4 Sep 2024 14:43:37 +0300 Subject: [PATCH 3/8] Try with checkboxes --- .github/ISSUE_TEMPLATE/08_collet-billing-data.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml b/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml index 32f2b79be1..98de645bad 100644 --- a/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml +++ b/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml @@ -34,8 +34,10 @@ body: Once these are done, the issue can be considered complete and can be closed. - ```[tasklist] - - [ ] Billing data is collected according to instructions. - - [ ] The #billing slack was notified about the new billing data - collected - ``` + - type: checkboxes + attributes: + options: + - label: Billing data is collected according to instructions. + required: false + - label: The #billing slack was notified about the new billing data collected + required: false From be5bdf174270846ccdb6bb465da744f58548cdbe Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Wed, 4 Sep 2024 14:44:35 +0300 Subject: [PATCH 4/8] Try escaping the # --- .github/ISSUE_TEMPLATE/08_collet-billing-data.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml b/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml index 98de645bad..39a1a1c708 100644 --- a/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml +++ b/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml @@ -39,5 +39,5 @@ body: options: - label: Billing data is collected according to instructions. required: false - - label: The #billing slack was notified about the new billing data collected + - label: The "#billing" slack was notified about the new billing data collected required: false From 9f1055744baedad85b572493f82e1d18297bc6ce Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Wed, 4 Sep 2024 14:45:50 +0300 Subject: [PATCH 5/8] Try without specials chars --- .github/ISSUE_TEMPLATE/08_collet-billing-data.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml b/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml index 39a1a1c708..1850379ac7 100644 --- a/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml +++ b/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml @@ -39,5 +39,5 @@ body: options: - label: Billing data is collected according to instructions. required: false - - label: The "#billing" slack was notified about the new billing data collected + - label: The billing slack was notified about the new billing data collected required: false From 106c2a6660f512bc41327d911139c325b6b618c3 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Wed, 4 Sep 2024 14:48:35 +0300 Subject: [PATCH 6/8] Add missing label --- .github/ISSUE_TEMPLATE/08_collet-billing-data.yaml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml b/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml index 1850379ac7..9134d1302c 100644 --- a/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml +++ b/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml @@ -6,13 +6,9 @@ body: - type: markdown attributes: value: | - This template is designed to help the engineers plan the recurrent task - of generating and collecting in one place the billing data either for - shared or for dedicated 2i2c clusters for a specific time interval. + This template is designed to help the engineers plan the recurrent task of generating and collecting in one place the billing data either for shared or for dedicated 2i2c clusters for a specific time interval. - Once all the info has been filled in, this issue is considered to be - fully refined and can be added to the `Refined` column of the Project - Board. + Once all the info has been filled in, this issue is considered to be fully refined and can be added to the `Refined` column of the Project Board. # Context @@ -31,10 +27,9 @@ body: value: | # Definition of Done - Once these are done, the issue can be considered complete and can be - closed. - - type: checkboxes + label: Tasklist + description: Once these are done, the issue can be considered complete and can be closed. attributes: options: - label: Billing data is collected according to instructions. From 22393dad166f11df0437de672a1423f8d2d8b8af Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Wed, 4 Sep 2024 14:49:46 +0300 Subject: [PATCH 7/8] Correctly indent the keys under attributes --- .github/ISSUE_TEMPLATE/08_collet-billing-data.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml b/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml index 9134d1302c..1c12e954ea 100644 --- a/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml +++ b/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml @@ -28,9 +28,9 @@ body: # Definition of Done - type: checkboxes - label: Tasklist - description: Once these are done, the issue can be considered complete and can be closed. attributes: + label: Tasklist + description: Once these are done, the issue can be considered complete and can be closed. options: - label: Billing data is collected according to instructions. required: false From 5f87293f8acd22797fde5e029d3b73cd4ccb5505 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Wed, 4 Sep 2024 14:51:28 +0300 Subject: [PATCH 8/8] Rename --- .../{08_collet-billing-data.yaml => 08_collect-billing-data.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{08_collet-billing-data.yaml => 08_collect-billing-data.yaml} (100%) diff --git a/.github/ISSUE_TEMPLATE/08_collet-billing-data.yaml b/.github/ISSUE_TEMPLATE/08_collect-billing-data.yaml similarity index 100% rename from .github/ISSUE_TEMPLATE/08_collet-billing-data.yaml rename to .github/ISSUE_TEMPLATE/08_collect-billing-data.yaml