From 8f452db4e915106b0f6cdf4272fa218d30b1dbc5 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 13 Mar 2024 10:13:11 +0000 Subject: [PATCH] Changes for 6.16.z new branch --- .github/dependabot.yml | 2 ++ robottelo/constants/__init__.py | 4 ++-- tests/foreman/cli/test_capsulecontent.py | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a40fa25f8fe..7c591380687 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,6 +10,7 @@ updates: schedule: interval: "daily" labels: + - '6.16.z' - "CherryPick" - "dependencies" - "6.15.z" @@ -23,6 +24,7 @@ updates: schedule: interval: "daily" labels: + - '6.16.z' - "CherryPick" - "dependencies" - "6.15.z" diff --git a/robottelo/constants/__init__.py b/robottelo/constants/__init__.py index 90991ce3df2..96f651ead0d 100644 --- a/robottelo/constants/__init__.py +++ b/robottelo/constants/__init__.py @@ -16,9 +16,9 @@ class Colored(Box): # 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 index 73e42659fa2..f49edac3cf0 100644 --- a/tests/foreman/cli/test_capsulecontent.py +++ b/tests/foreman/cli/test_capsulecontent.py @@ -43,7 +43,6 @@ ], indirect=True, ) -@pytest.mark.stream def test_positive_content_counts_for_mixed_cv( target_sat, module_capsule_configured, @@ -179,7 +178,6 @@ def test_positive_content_counts_for_mixed_cv( assert len(info['lifecycle-environments']) == 0, 'The LCE is still listed' -@pytest.mark.stream def test_positive_update_counts(target_sat, module_capsule_configured): """Verify the update counts functionality