Changes for 6.15.z new branch (#13168)

.github/dependabot.yml

@@ -12,6 +12,7 @@ updates:
     labels:
       - "CherryPick"
       - "dependencies"
+      - "6.15.z"
       - "6.14.z"
       - "6.13.z"
       - "6.12.z"
@@ -24,6 +25,7 @@ updates:
     labels:
       - "CherryPick"
       - "dependencies"
+      - "6.15.z"
       - "6.14.z"
       - "6.13.z"
       - "6.12.z"

requirements.txt

@@ -26,7 +26,7 @@ testimony==2.3.0
 wait-for==1.2.0
 wrapanapi==3.6.0
 
-# Get airgun, nailgun and upgrade from master
-git+https://github.com/SatelliteQE/airgun.git@master#egg=airgun
-git+https://github.com/SatelliteQE/nailgun.git@master#egg=nailgun
+# Get airgun, nailgun and upgrade from 6.15.z
+git+https://github.com/SatelliteQE/airgun.git@6.15.z#egg=airgun
+git+https://github.com/SatelliteQE/nailgun.git@6.15.z#egg=nailgun
 --editable .

robottelo/constants/__init__.py

@@ -18,7 +18,7 @@ class Colored(Box):
 # This should be updated after each version branch
 SATELLITE_VERSION = "6.15"
 SATELLITE_OS_VERSION = "8"
-SAT_NON_GA_VERSIONS = ['6.14', '6.15']
+SAT_NON_GA_VERSIONS = ['6.15']
 
 # Default system ports
 HTTPS_PORT = '443'
@@ -171,7 +171,7 @@ class Colored(Box):
 AZURERM_VM_SIZE_DEFAULT = 'Standard_B1s'
 AZURERM_PREMIUM_OS_Disk = True
 AZURERM_FILE_URI = (
-    'https://raw.githubusercontent.com/SatelliteQE/robottelo/master/tests/foreman/data/uri.sh'
+    'https://raw.githubusercontent.com/SatelliteQE/robottelo/6.15.z/tests/foreman/data/uri.sh'
 )
 
 OPERATING_SYSTEMS = entities._OPERATING_SYSTEMS

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='robottelo',
-    version='0.1.0',
+    version='6.15.0',
     description='Robottelo is a test suite which exercises The Foreman.',
     long_description=README,
     author='Satellite QE Team',

tests/foreman/api/test_capsulecontent.py

@@ -1458,7 +1458,6 @@ def test_positive_capsule_sync_openstack_container_repos(
 
         module_capsule_configured.wait_for_sync()
 
-    @pytest.mark.stream
     @pytest.mark.parametrize(
         'repos_collection',
         [
@@ -1597,7 +1596,6 @@ def test_positive_content_counts_for_mixed_cv(
                 [repo.content_counts.get(key) == cnt['counts'].get(key) for key in common_keys]
             )
 
-    @pytest.mark.stream
     @pytest.mark.order(1)
     def test_positive_content_counts_blank_update(
         self,

tests/foreman/api/test_contentviewfilter.py

@@ -675,7 +675,6 @@ def test_negative_update_repo(self, module_product, sync_repo, content_view, tar
         with pytest.raises(HTTPError):
             cvf.update(['repository'])
 
-    @pytest.mark.stream
     @pytest.mark.tier2
     @pytest.mark.parametrize(
         'filter_type', ['erratum', 'package_group', 'rpm', 'modulemd', 'docker']

tests/foreman/destructive/test_infoblox.py

@@ -116,7 +116,6 @@ def test_plugin_installation(target_sat, command_args, command_opts, rpm_command
     assert target_sat.execute(rpm_command).status == 0
 
 
-@pytest.mark.stream
 @pytest.mark.e2e
 @pytest.mark.parametrize('module_sync_kickstart_content', [8], indirect=True)
 def test_infoblox_end_to_end(

tests/foreman/maintain/test_service.py

@@ -125,7 +125,6 @@ def test_positive_service_stop_start(sat_maintain):
     assert result.status == 0
 
 
-@pytest.mark.stream
 @pytest.mark.upgrade
 @pytest.mark.include_capsule
 @pytest.mark.usefixtures('start_satellite_services')

tests/foreman/ui/test_settings.py

@@ -551,7 +551,6 @@ def test_positive_entries_per_page(session, setting_update):
 
 
 @pytest.mark.tier2
-@pytest.mark.stream
 def test_positive_setting_display_fqdn_for_hosts(session, target_sat):
     """Verify setting display_fqdn_for_hosts set as Yes/No, and FQDN is used for host's name
     if it's set to Yes else not, according to setting set.