From a3b90cc86346abefc46d1602ae73b423cf2a4cc5 Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Tue, 14 Sep 2021 21:20:33 -0700 Subject: [PATCH] canonicalize needles JSON and fix conflict --- .../identification/rocky-leftbar_generic-20210805.json | 1 + .../anaconda/identification/rocky-leftbar_server-20210809.json | 1 + .../anaconda/identification/rocky-topbar_generic-20210807.json | 1 + .../rocky-install_lang_english_selected-20210805.json | 1 + .../rocky-boot_to_anaconda-version_8.4_ident-20210805.json | 1 + .../main_hub/rocky-boot_to_anaconda-version_8_ident.json | 1 + ...-boot_to_anaconda-version_greenobsidian_ident-20210807.json | 3 ++- needles/anaconda/partitioning/rocky-fs_ext4-20210813.json | 1 + .../partitioning/rocky-fs_ext4_preselected-20210812.json | 2 +- .../partitioning/rocky-fs_xfs_preselected-20210812.json | 2 +- .../partitioning/rocky-manual_partitioning-20210812.json | 2 +- needles/cockpit/rocky-autoupdate_planned_day-20210814.json | 1 + needles/cockpit/rocky-cockpit_login-20210814.json | 1 + needles/cockpit/rocky-cockpit_updates_auto_all-20210814.json | 1 + needles/console/rocky-bootloader-bios-20210805.json | 1 + 15 files changed, 16 insertions(+), 4 deletions(-) diff --git a/needles/anaconda/identification/rocky-leftbar_generic-20210805.json b/needles/anaconda/identification/rocky-leftbar_generic-20210805.json index e405bf13..254f1e6a 100644 --- a/needles/anaconda/identification/rocky-leftbar_generic-20210805.json +++ b/needles/anaconda/identification/rocky-leftbar_generic-20210805.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "leftbar_generic" ] } \ No newline at end of file diff --git a/needles/anaconda/identification/rocky-leftbar_server-20210809.json b/needles/anaconda/identification/rocky-leftbar_server-20210809.json index 47305f5e..008b154c 100644 --- a/needles/anaconda/identification/rocky-leftbar_server-20210809.json +++ b/needles/anaconda/identification/rocky-leftbar_server-20210809.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "leftbar_server" ] } \ No newline at end of file diff --git a/needles/anaconda/identification/rocky-topbar_generic-20210807.json b/needles/anaconda/identification/rocky-topbar_generic-20210807.json index 3ead9a62..b722285b 100644 --- a/needles/anaconda/identification/rocky-topbar_generic-20210807.json +++ b/needles/anaconda/identification/rocky-topbar_generic-20210807.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "topbar_generic" ] } \ No newline at end of file diff --git a/needles/anaconda/lang_select/rocky-install_lang_english_selected-20210805.json b/needles/anaconda/lang_select/rocky-install_lang_english_selected-20210805.json index 71c65fc9..7e084f65 100644 --- a/needles/anaconda/lang_select/rocky-install_lang_english_selected-20210805.json +++ b/needles/anaconda/lang_select/rocky-install_lang_english_selected-20210805.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "anaconda_select_install_lang_selected", "anaconda_select_install_lang_filtered", "LANGUAGE-english" diff --git a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8.4_ident-20210805.json b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8.4_ident-20210805.json index 51e81bfb..37281c6a 100644 --- a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8.4_ident-20210805.json +++ b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8.4_ident-20210805.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "version_8.4_ident" ] } \ No newline at end of file diff --git a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident.json b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident.json index dccb2210..b3a59037 100644 --- a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident.json +++ b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "version_8_ident" ] } diff --git a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_greenobsidian_ident-20210807.json b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_greenobsidian_ident-20210807.json index d60fb7b5..daf8cba7 100644 --- a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_greenobsidian_ident-20210807.json +++ b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_greenobsidian_ident-20210807.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "version_greenobsidian_ident" ] -} +} \ No newline at end of file diff --git a/needles/anaconda/partitioning/rocky-fs_ext4-20210813.json b/needles/anaconda/partitioning/rocky-fs_ext4-20210813.json index d6c9bbfb..bd77b45b 100644 --- a/needles/anaconda/partitioning/rocky-fs_ext4-20210813.json +++ b/needles/anaconda/partitioning/rocky-fs_ext4-20210813.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "anaconda_part_fs_ext4" ] } \ No newline at end of file diff --git a/needles/anaconda/partitioning/rocky-fs_ext4_preselected-20210812.json b/needles/anaconda/partitioning/rocky-fs_ext4_preselected-20210812.json index de88e44f..794a1324 100644 --- a/needles/anaconda/partitioning/rocky-fs_ext4_preselected-20210812.json +++ b/needles/anaconda/partitioning/rocky-fs_ext4_preselected-20210812.json @@ -12,6 +12,6 @@ "tags": [ "anaconda_part_fs", "anaconda_part_fs_ext4_selected", - "ENV-DISTRI-fedora" + "ENV-DISTRI-rocky", ] } \ No newline at end of file diff --git a/needles/anaconda/partitioning/rocky-fs_xfs_preselected-20210812.json b/needles/anaconda/partitioning/rocky-fs_xfs_preselected-20210812.json index cf9226c9..df69348a 100644 --- a/needles/anaconda/partitioning/rocky-fs_xfs_preselected-20210812.json +++ b/needles/anaconda/partitioning/rocky-fs_xfs_preselected-20210812.json @@ -10,7 +10,7 @@ ], "properties": [], "tags": [ - "ENV-DISTRI-fedora", + "ENV-DISTRI-rocky", "anaconda_part_fs", "anaconda_part_fs_xfs_selected" ] diff --git a/needles/anaconda/partitioning/rocky-manual_partitioning-20210812.json b/needles/anaconda/partitioning/rocky-manual_partitioning-20210812.json index 4af8343b..f31f61f2 100644 --- a/needles/anaconda/partitioning/rocky-manual_partitioning-20210812.json +++ b/needles/anaconda/partitioning/rocky-manual_partitioning-20210812.json @@ -10,7 +10,7 @@ ], "properties": [], "tags": [ - "DISTRI-rocky", + "ENV-DISTRI-rocky", "LANGUAGE-english", "anaconda_manual_partitioning" ] diff --git a/needles/cockpit/rocky-autoupdate_planned_day-20210814.json b/needles/cockpit/rocky-autoupdate_planned_day-20210814.json index 9ea9624d..b4b4cdfa 100644 --- a/needles/cockpit/rocky-autoupdate_planned_day-20210814.json +++ b/needles/cockpit/rocky-autoupdate_planned_day-20210814.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "autoupdate_planned_day" ] } \ No newline at end of file diff --git a/needles/cockpit/rocky-cockpit_login-20210814.json b/needles/cockpit/rocky-cockpit_login-20210814.json index 44c193f4..6f6d8ab3 100644 --- a/needles/cockpit/rocky-cockpit_login-20210814.json +++ b/needles/cockpit/rocky-cockpit_login-20210814.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "cockpit_login" ] } \ No newline at end of file diff --git a/needles/cockpit/rocky-cockpit_updates_auto_all-20210814.json b/needles/cockpit/rocky-cockpit_updates_auto_all-20210814.json index 9f9aa929..fb801be5 100644 --- a/needles/cockpit/rocky-cockpit_updates_auto_all-20210814.json +++ b/needles/cockpit/rocky-cockpit_updates_auto_all-20210814.json @@ -14,6 +14,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "cockpit_updates_auto_all" ] } \ No newline at end of file diff --git a/needles/console/rocky-bootloader-bios-20210805.json b/needles/console/rocky-bootloader-bios-20210805.json index 375720bf..735f31c9 100644 --- a/needles/console/rocky-bootloader-bios-20210805.json +++ b/needles/console/rocky-bootloader-bios-20210805.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "bootloader", "bootloader_bios" ]