From 69742ac28f5aebfeecfe58f59e71a18e224384f8 Mon Sep 17 00:00:00 2001 From: valentijnscholten Date: Tue, 25 Feb 2025 21:20:14 +0100 Subject: [PATCH] jira issue type migration quickfix (#11831) * jira issue type migration quickfix * jira issue type migration quickfix: add env variable to unit test * jira issue type migration quickfix: add env variable to unit test --- docker-compose.override.unit_tests.yml | 1 + docker-compose.override.unit_tests_cicd.yml | 1 + dojo/db_migrations/0027_jira_issue_type_settings.py | 3 ++- .../0182_alter_jira_instance_default_issue_type.py | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docker-compose.override.unit_tests.yml b/docker-compose.override.unit_tests.yml index 45b60e30bd2..a05f0f2b278 100644 --- a/docker-compose.override.unit_tests.yml +++ b/docker-compose.override.unit_tests.yml @@ -29,6 +29,7 @@ services: DD_CELERY_BROKER_PORT: "-1" DD_CELERY_BROKER_PATH: '/dojo.celerydb.sqlite' DD_CELERY_BROKER_PARAMS: '' + DD_JIRA_EXTRA_ISSUE_TYPES: 'Vulnerability' # Shouldn't trigger a migration error celerybeat: image: busybox:1.37.0-musl entrypoint: ['echo', 'skipping', 'celery beat'] diff --git a/docker-compose.override.unit_tests_cicd.yml b/docker-compose.override.unit_tests_cicd.yml index bd19580c7ff..e9ee1ffdcfc 100644 --- a/docker-compose.override.unit_tests_cicd.yml +++ b/docker-compose.override.unit_tests_cicd.yml @@ -28,6 +28,7 @@ services: DD_CELERY_BROKER_PORT: "-1" DD_CELERY_BROKER_PATH: '/dojo.celerydb.sqlite' DD_CELERY_BROKER_PARAMS: '' + DD_JIRA_EXTRA_ISSUE_TYPES: 'Vulnerability' # Shouldn't trigger a migration error celerybeat: image: busybox:1.37.0-musl entrypoint: ['echo', 'skipping', 'celery beat'] diff --git a/dojo/db_migrations/0027_jira_issue_type_settings.py b/dojo/db_migrations/0027_jira_issue_type_settings.py index 4f39a0a4a80..467bd8c5128 100644 --- a/dojo/db_migrations/0027_jira_issue_type_settings.py +++ b/dojo/db_migrations/0027_jira_issue_type_settings.py @@ -1,5 +1,6 @@ # Generated by Django 2.2.4 on 2020-01-02 15:33 +from django.conf import settings from django.db import migrations, models @@ -13,6 +14,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='jira_conf', name='default_issue_type', - field=models.CharField(choices=[('Task', 'Task'), ('Story', 'Story'), ('Epic', 'Epic'), ('Spike', 'Spike'), ('Bug', 'Bug'), ('Security', 'Security')], default='Bug', help_text='You can define extra issue types in settings.py', max_length=15), + field=models.CharField(choices=settings.JIRA_ISSUE_TYPE_CHOICES_CONFIG, default='Bug', help_text='You can define extra issue types in settings.py', max_length=15), ), ] diff --git a/dojo/db_migrations/0182_alter_jira_instance_default_issue_type.py b/dojo/db_migrations/0182_alter_jira_instance_default_issue_type.py index 7260701ac89..3af7705b9d3 100644 --- a/dojo/db_migrations/0182_alter_jira_instance_default_issue_type.py +++ b/dojo/db_migrations/0182_alter_jira_instance_default_issue_type.py @@ -1,5 +1,6 @@ # Generated by Django 4.1.7 on 2023-03-06 11:38 +from django.conf import settings from django.db import migrations, models @@ -13,6 +14,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='jira_instance', name='default_issue_type', - field=models.CharField(choices=[('Task', 'Task'), ('Story', 'Story'), ('Epic', 'Epic'), ('Spike', 'Spike'), ('Bug', 'Bug'), ('Security', 'Security')], default='Bug', help_text='You can define extra issue types in settings.py', max_length=255), + field=models.CharField(choices=settings.JIRA_ISSUE_TYPE_CHOICES_CONFIG, default='Bug', help_text='You can define extra issue types in settings.py', max_length=255), ), ]