diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14efb635d9b9b8f320a14601ca8f9069c08fe879..22338d7aa52e03ca5a2a2f6e7878b1d692c901ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,7 +67,7 @@ ostack-einfra_cz-trigger-communication-generation: TEMPLATE_PATH: "howtos/email_tool/g1-g2-migration/templates/mail-final_project-migrated" TRIGGER_URL: "https://gitlab.ics.muni.cz/api/v4/projects/2804/trigger/pipeline" script: - - ci/generate-data-for-communication.py --source-openrc="${SRC_CLOUD_OSTACK_RC_FILE}" --destination-openrc="${DST_CLOUD_OSTACK_RC_FILE}" --project-name="${PROJECT_NAME}" --signature="${GITLAB_USER_NAME}" --expiration="${PROJECT_EXPIRATION}" + - ci/generate-data-for-communication.py --source-openrc="${SRC_CLOUD_OSTACK_RC_FILE}" --destination-openrc="${DST_CLOUD_OSTACK_RC_FILE}" --project-name="${PROJECT_NAME}" --signature="${GITLAB_USER_NAME}" --expiration="${PROJECT_EXPIRATION}" --migration-date="${MIGRATION_DATE}" - zip -P ${ZIP_DATA_ENCRYTPION_PASSWORD} data.zip data.csv servers.csv - BASE64_ZIP_FILE=$(base64 -w 0 data.zip) - RESPONSE=$(curl -X POST -F token=${TRIGGER_TOKEN_KB} -F ref=master -F "variables[TEMPLATE]=${TEMPLATE_PATH}" -F "variables[BASE64_DATA]=${BASE64_ZIP_FILE}" ${TRIGGER_URL}) diff --git a/CHANGELOG.md b/CHANGELOG.md index 894a2fc6155e3eb599e34e073389aa6b5a325f50..ac2780e29f45a144b23c6a44c233deebddb74c68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.5.3] - 2024-08-05 +### Changed +- Changed generate-data-for-cummunication script - added possibility to specify migration date. +- This change is reflected in .gitlab-ci.yml + ## [1.5.2] - 2024-07-25 ### Fixed - temporarily disable compute quotas check diff --git a/ci/generate-data-for-communication.py b/ci/generate-data-for-communication.py index 3c4d59e283792d1e42df3555214a1855beab9b81..2c6a62914a232ec6f4aa4f95c84c39783898a099 100755 --- a/ci/generate-data-for-communication.py +++ b/ci/generate-data-for-communication.py @@ -15,8 +15,9 @@ Usage example: --source-openrc ~/c/prod-einfra_cz_migrator.sh.inc --destination-openrc ~/c/g2-prod-brno-einfra_cz_migrator.sh.inc --project-name meta-cloud-new-openstack - --signature John Doe - --expiration 1.1.2025 + --signature 'John Doe' + --expiration 1.1.2025 + --migration-date 2.2.2025 """ import argparse @@ -65,7 +66,7 @@ def main(args): lib.assert_entity_ownership(destination_project_servers, destination_project) # prepare project data - today = date.today() + migration_date = args.migration_date vm_count = len(destination_project_servers) signature = args.signature project_expiration = args.expiration @@ -73,7 +74,7 @@ def main(args): project_data = [ { "project_name": source_project_name, - "migration_date": today, + "migration_date": migration_date, "project_expiration": project_expiration, "vm_count": vm_count, "signature": signature, @@ -147,6 +148,8 @@ if __name__ == "__main__": help='Signature of person who will be sending the mail.') AP.add_argument('--expiration', default=None, required=True, help='Date of expiration of project.') + AP.add_argument('--migration-date', default=date.today().strftime("%-d.%-m.%Y"), required=False, + help='Date of migration of project.') AP.add_argument('--exception-trace-file', default="project-migrator.dump", required=False,