From 046d76510088f7f3a6312ed353325f1e99e10294 Mon Sep 17 00:00:00 2001 From: Bert Blommers Date: Sun, 19 Feb 2023 13:21:34 -0100 Subject: [PATCH] Admin: Ensure Automatic data update scripts use a unique branch (#5947) --- .github/workflows/data-update_ec2-instance-offerings.yml | 2 +- .github/workflows/data-update_ec2-instance-types.yml | 2 +- .github/workflows/data-update_ssm-default-amis.yml | 3 ++- .github/workflows/data-update_ssm-default-parameters.yml | 3 ++- scripts/ssm_get_default_params.py | 1 - 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/data-update_ec2-instance-offerings.yml b/.github/workflows/data-update_ec2-instance-offerings.yml index 969e81709..1b3ebfc17 100644 --- a/.github/workflows/data-update_ec2-instance-offerings.yml +++ b/.github/workflows/data-update_ec2-instance-offerings.yml @@ -47,5 +47,5 @@ jobs: COMMIT_MESSAGE: 'chore: update EC2 Instance Offerings' COMMIT_NAME: 'Moto Admin' COMMIT_EMAIL: 'admin@getmoto.org' - PR_BRANCH_NAME: 'chore-update-${PR_ID}' + PR_BRANCH_NAME: 'chore-update-ec2-offerings-${PR_ID}' PR_TITLE: 'chore: update EC2 Instance Offerings' diff --git a/.github/workflows/data-update_ec2-instance-types.yml b/.github/workflows/data-update_ec2-instance-types.yml index f9de2123d..e49bf1be1 100644 --- a/.github/workflows/data-update_ec2-instance-types.yml +++ b/.github/workflows/data-update_ec2-instance-types.yml @@ -46,5 +46,5 @@ jobs: COMMIT_MESSAGE: 'chore: update EC2 Instance Types' COMMIT_NAME: 'Moto Admin' COMMIT_EMAIL: 'admin@getmoto.org' - PR_BRANCH_NAME: 'chore-update-${PR_ID}' + PR_BRANCH_NAME: 'chore-update-ec2-types-${PR_ID}' PR_TITLE: 'chore: update EC2 Instance Types' diff --git a/.github/workflows/data-update_ssm-default-amis.yml b/.github/workflows/data-update_ssm-default-amis.yml index 2f1b48bb4..a84a5d4d6 100644 --- a/.github/workflows/data-update_ssm-default-amis.yml +++ b/.github/workflows/data-update_ssm-default-amis.yml @@ -43,9 +43,10 @@ jobs: GITHUB_TOKEN: ${{ secrets.PR_ACCESS_TOKEN }} EXECUTE_COMMANDS: | pip install boto3 + pip install moto python scripts/ssm_get_default_amis.py COMMIT_MESSAGE: "chore: update SSM default AMI's" COMMIT_NAME: 'Moto Admin' COMMIT_EMAIL: 'admin@getmoto.org' - PR_BRANCH_NAME: 'chore-update-${PR_ID}' + PR_BRANCH_NAME: 'chore-update-ssm-amis-${PR_ID}' PR_TITLE: "chore: update SSM Instance AMI's" diff --git a/.github/workflows/data-update_ssm-default-parameters.yml b/.github/workflows/data-update_ssm-default-parameters.yml index eb876edb8..06451ef8c 100644 --- a/.github/workflows/data-update_ssm-default-parameters.yml +++ b/.github/workflows/data-update_ssm-default-parameters.yml @@ -43,9 +43,10 @@ jobs: GITHUB_TOKEN: ${{ secrets.PR_ACCESS_TOKEN }} EXECUTE_COMMANDS: | pip install boto3 + pip install moto python scripts/ssm_get_default_params.py COMMIT_MESSAGE: "chore: update SSM default parameters" COMMIT_NAME: 'Moto Admin' COMMIT_EMAIL: 'admin@getmoto.org' - PR_BRANCH_NAME: 'chore-update-${PR_ID}' + PR_BRANCH_NAME: 'chore-update-ssm-params-${PR_ID}' PR_TITLE: "chore: update SSM Instance parameters" diff --git a/scripts/ssm_get_default_params.py b/scripts/ssm_get_default_params.py index 794484493..b995bece4 100755 --- a/scripts/ssm_get_default_params.py +++ b/scripts/ssm_get_default_params.py @@ -2,7 +2,6 @@ import boto3 import json import os import subprocess -import sure # noqa # pylint: disable=unused-import import time from moto.ssm.utils import convert_to_tree