diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5fda357b321..a40fa25f8fe 100644 --- a/.github/dependabot.yml +++ b/.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" diff --git a/.github/workflows/dispatch_release.yml b/.github/workflows/dispatch_release.yml deleted file mode 100644 index 51b6b90919a..00000000000 --- a/.github/workflows/dispatch_release.yml +++ /dev/null @@ -1,31 +0,0 @@ -### The auto release workflow triggered through dispatch request from CI -name: auto-release - -# Run on workflow dispatch from CI -on: - workflow_dispatch: - inputs: - tag_name: - type: string - description: Name of the tag - -jobs: - auto-tag-and-release: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - - name: Git User setup - run: "git config --local user.email Satellite-QE.satqe.com && git config --local user.name Satellite-QE" - - - name: Tag latest commit - run: "git tag -a ${{ github.event.inputs.tag_name }} -m 'Tagged By SatelliteQE Automation User'" - - - name: Push the tag to the upstream - run: "git push ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git --tags" - - - name: create a new release from the tag - env: - credentials: ${{ secrets.GH_TOKEN }} - run: "curl -L -X POST -H \"Authorization: Bearer ${{ secrets.SATQE_GH_TOKEN }}\" ${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases -d '{\"tag_name\": \"${{ github.event.inputs.tag_name }}\", \"target_commitish\":\"master\", \"name\":\"${{ github.event.inputs.tag_name }}\", \"draft\":false, \"prerelease\":true, \"generate_release_notes\": true}'" diff --git a/requirements.txt b/requirements.txt index ccdeb8c74f2..bf43b1ff262 100644 --- a/requirements.txt +++ b/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 . diff --git a/robottelo/constants/__init__.py b/robottelo/constants/__init__.py index 05dd6e878b2..5f50f23b0e1 100644 --- a/robottelo/constants/__init__.py +++ b/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 diff --git a/setup.py b/setup.py index 7e0feb9f2b3..566fc65fb92 100755 --- a/setup.py +++ b/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', diff --git a/tests/foreman/api/test_capsulecontent.py b/tests/foreman/api/test_capsulecontent.py index f809dda6cc9..f5bfe4e87a9 100644 --- a/tests/foreman/api/test_capsulecontent.py +++ b/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, diff --git a/tests/foreman/api/test_contentviewfilter.py b/tests/foreman/api/test_contentviewfilter.py index dd07d57dd27..8e4ac95c75d 100644 --- a/tests/foreman/api/test_contentviewfilter.py +++ b/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'] diff --git a/tests/foreman/destructive/test_infoblox.py b/tests/foreman/destructive/test_infoblox.py index 1230507f8e0..8aa92f22a83 100644 --- a/tests/foreman/destructive/test_infoblox.py +++ b/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( diff --git a/tests/foreman/maintain/test_service.py b/tests/foreman/maintain/test_service.py index 5e9f24c6510..b1cd9d8342e 100644 --- a/tests/foreman/maintain/test_service.py +++ b/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') diff --git a/tests/foreman/ui/test_settings.py b/tests/foreman/ui/test_settings.py index 91610d4977f..231e69a6fe9 100644 --- a/tests/foreman/ui/test_settings.py +++ b/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.