diff --git a/awx/main/migrations/0142_update_ee_image_field_description.py b/awx/main/migrations/0142_update_ee_image_field_description.py new file mode 100644 index 0000000000..20830abc2b --- /dev/null +++ b/awx/main/migrations/0142_update_ee_image_field_description.py @@ -0,0 +1,22 @@ +# Generated by Django 2.2.16 on 2021-05-12 20:08 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0141_remove_isolated_instances'), + ] + + operations = [ + migrations.AlterField( + model_name='executionenvironment', + name='image', + field=models.CharField( + help_text='The full image location, including the container registry, image name, and version tag.', + max_length=1024, + verbose_name='image location', + ), + ), + ] diff --git a/awx/main/models/execution_environments.py b/awx/main/models/execution_environments.py index 4a95f783b5..4bf8309bc8 100644 --- a/awx/main/models/execution_environments.py +++ b/awx/main/models/execution_environments.py @@ -30,7 +30,7 @@ class ExecutionEnvironment(CommonModel): image = models.CharField( max_length=1024, verbose_name=_('image location'), - help_text=_("The registry location where the container is stored."), + help_text=_("The full image location, including the container registry, image name, and version tag."), ) managed_by_tower = models.BooleanField(default=False, editable=False) credential = models.ForeignKey( diff --git a/awx/ui_next/src/screens/ExecutionEnvironment/shared/ExecutionEnvironmentForm.jsx b/awx/ui_next/src/screens/ExecutionEnvironment/shared/ExecutionEnvironmentForm.jsx index 59dff9fc16..434992990e 100644 --- a/awx/ui_next/src/screens/ExecutionEnvironment/shared/ExecutionEnvironmentForm.jsx +++ b/awx/ui_next/src/screens/ExecutionEnvironment/shared/ExecutionEnvironmentForm.jsx @@ -95,12 +95,27 @@ function ExecutionEnvironmentFormFields({ /> + {t`The full image location, including the container registry, image name, and version tag.`} +
+
+ {t`Examples:`} + + + } /> ', () => { }); test('should display form fields properly', () => { - expect(wrapper.find('FormGroup[label="Image name"]').length).toBe(1); + expect(wrapper.find('FormGroup[label="Image"]').length).toBe(1); expect(wrapper.find('FormGroup[label="Description"]').length).toBe(1); expect(wrapper.find('CredentialLookup').length).toBe(1); });