[master]: Changes for new 6.16.z branch (#15211)

* Changes for new 6.16.z branch * removing the 6.12.z as it is absoute --------- Co-authored-by: GitHub Action <[email protected]> Co-authored-by: omkarkhatavkar <[email protected]>
SatelliteQE · Jun 3, 2024 · 65b7d28 · 65b7d28
1 parent 2152e51
commit 65b7d28
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,22 +10,22 @@ updates:
     schedule:
       interval: "daily"
     labels:
+      - '6.16.z'
       - "CherryPick"
       - "dependencies"
       - "6.15.z"
       - "6.14.z"
       - "6.13.z"
-      - "6.12.z"
 
   # Maintain dependencies for our GitHub Actions
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "daily"
     labels:
+      - '6.16.z'
       - "CherryPick"
       - "dependencies"
       - "6.15.z"
       - "6.14.z"
       - "6.13.z"
-      - "6.12.z"
diff --git a/conf/robottelo.yaml.template b/conf/robottelo.yaml.template
@@ -15,7 +15,7 @@ ROBOTTELO:
   RUN_ONE_DATAPOINT: false
   # Satellite version supported by this branch
   # UNDR version is used for some URL composition
-  SATELLITE_VERSION: "6.16"
+  SATELLITE_VERSION: "6.17"
   # The Base OS RHEL Version(x.y) where the satellite would be installed
   RHEL_VERSION: "8.9"
   # Dynaconf and Dynaconf hooks related options

diff --git a/robottelo/constants/__init__.py b/robottelo/constants/__init__.py
@@ -6,9 +6,9 @@
 from nailgun import entities
 
 # This should be updated after each version branch
-SATELLITE_VERSION = "6.16"
+SATELLITE_VERSION = "6.17"
 SATELLITE_OS_VERSION = "8"
-SAT_NON_GA_VERSIONS = ['6.15', '6.16']
+SAT_NON_GA_VERSIONS = ['6.16', '6.17']
 
 # Default system ports
 HTTPS_PORT = '443'

diff --git a/tests/foreman/cli/test_capsulecontent.py b/tests/foreman/cli/test_capsulecontent.py
@@ -306,7 +306,6 @@ def test_positive_update_counts(target_sat, module_capsule_configured):
     )
 
 
-@pytest.mark.stream
 @pytest.mark.parametrize('repair_type', ['repo', 'cv', 'lce'])
 @pytest.mark.parametrize(
     'module_synced_content',

diff --git a/tests/foreman/installer/test_installer.py b/tests/foreman/installer/test_installer.py
@@ -406,7 +406,6 @@ def test_positive_check_installer_hammer_ping(target_sat):
             assert 'ok' in line
 
 
-@pytest.mark.stream
 @pytest.mark.upgrade
 @pytest.mark.tier3
 @pytest.mark.build_sanity