Merge branch 'master' into nilclass-publish

.github/workflows/auto_assignment.yaml

@@ -15,6 +15,6 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, 'Auto_Cherry_Picked')"
     runs-on: ubuntu-latest
     steps:
-      - uses: kentaro-m/[email protected].5
+      - uses: kentaro-m/[email protected].6
         with:
           configuration-path: ".github/auto_assign.yml"

.github/workflows/auto_cherry_pick.yml

@@ -77,11 +77,12 @@ jobs:
       - name: Add Parent PR's PRT comment to Auto_Cherry_Picked PR's
         id: add-parent-prt-comment
         if: ${{ always() && steps.cherrypick.outcome == 'success' }}
-        run: |
-          curl -X POST -H "Authorization: token ${{ secrets.CHERRYPICK_PAT }}" \
-            -H "Accept: application/vnd.github.v3+json" \
-            "https://api.github.com/repos/${{ github.repository }}/issues/${{ steps.cherrypick.outputs.number }}/comments" \
-            -d "{\"body\":\"${{ needs.find-the-parent-prt-comment.outputs.prt_comment }}\"}"
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          message: |
+            ${{ needs.find-the-parent-prt-comment.outputs.prt_comment }}
+          pr_number: ${{ steps.cherrypick.outputs.number  }}
+          GITHUB_TOKEN: ${{ secrets.CHERRYPICK_PAT }}
 
       - name: is autoMerging enabled for Auto CherryPicked PRs ?
         if: ${{ always() && steps.cherrypick.outcome == 'success' && contains(github.event.pull_request.labels.*.name, 'AutoMerge_Cherry_Picked') }}

.github/workflows/auto_cherry_pick_merge.yaml

@@ -40,7 +40,7 @@ jobs:
 
       - name: Wait for other status checks to Pass
         id: waitforstatuschecks
-        uses: lewagon/[email protected].1
+        uses: lewagon/[email protected].3
         with:
           ref: ${{ github.head_ref }}
           repo-token: ${{ secrets.CHERRYPICK_PAT }}
@@ -67,7 +67,7 @@ jobs:
 
       - id: automerge
         name: Auto merge of cherry-picked PRs.
-        uses: "pascalgn/automerge-action@v0.15.6"
+        uses: "pascalgn/automerge-action@v0.16.2"
         env:
           GITHUB_TOKEN: "${{ secrets.CHERRYPICK_PAT }}"
           MERGE_LABELS: "AutoMerge_Cherry_Picked, Auto_Cherry_Picked"

.github/workflows/dependency_merge.yml

@@ -51,7 +51,7 @@ jobs:
 
       - name: Wait for other status checks to Pass
         id: waitforstatuschecks
-        uses: lewagon/[email protected].1
+        uses: lewagon/[email protected].3
         with:
           ref: ${{ github.head_ref }}
           repo-token: ${{ secrets.CHERRYPICK_PAT }}
@@ -61,7 +61,7 @@ jobs:
 
       - id: automerge
         name: Auto merge of dependabot PRs.
-        uses: "pascalgn/automerge-action@v0.15.6"
+        uses: "pascalgn/automerge-action@v0.16.2"
         env:
           GITHUB_TOKEN: "${{ secrets.CHERRYPICK_PAT }}"
           MERGE_LABELS: "dependencies"

conf/ui.yaml.template

@@ -24,13 +24,15 @@ UI:
   WEBDRIVER: chrome
   # Binary location for selected wedriver (not needed if using saucelabs)
   WEBDRIVER_BINARY: /usr/bin/chromedriver
-
+  RECORD_VIDEO: false
+  GRID_URL: http://infra-grid.example.com:4444
   # Web_Kaifuku Settings (checkout https://github.com/RonnyPfannschmidt/webdriver_kaifuku)
   WEBKAIFUKU:
     webdriver: chrome/remote
     webdriver_options:
       command_executor: http://localhost:4444/wd/hub
       desired_capabilities:
+        se:recordVideo: '@jinja {{ this.ui.record_video }}'
         browserName: chrome
         chromeOptions:
           args:

conftest.py

@@ -52,6 +52,7 @@
     'pytest_fixtures.component.provision_gce',
     'pytest_fixtures.component.provision_libvirt',
     'pytest_fixtures.component.provision_pxe',
+    'pytest_fixtures.component.provision_capsule_pxe',
     'pytest_fixtures.component.provision_vmware',
     'pytest_fixtures.component.provisioning_template',
     'pytest_fixtures.component.puppet',

pyproject.toml

@@ -20,6 +20,7 @@ target-version = "py311"
 fixable = ["ALL"]
 
 select = [
+    "B",  # bugbear
     # "C90", # mccabe
     "E",  # pycodestyle
     "F",  # flake8
@@ -31,6 +32,7 @@ select = [
 ]
 
 ignore = [
+    "B019",  # lru_cache can lead to memory leaks - acceptable tradeoff
     "E501",  # line too long - handled by black
     "PT004", # pytest underscrore prefix for non-return fixtures
     "PT005", # pytest no underscrore prefix for return fixtures

pytest_fixtures/component/activationkey.py

@@ -6,13 +6,12 @@
 
 
 @pytest.fixture(scope='module')
-def module_activation_key(module_entitlement_manifest_org, module_target_sat):
+def module_activation_key(module_sca_manifest_org, module_target_sat):
     """Create activation key using default CV and library environment."""
     activation_key = module_target_sat.api.ActivationKey(
-        auto_attach=True,
-        content_view=module_entitlement_manifest_org.default_content_view.id,
-        environment=module_entitlement_manifest_org.library.id,
-        organization=module_entitlement_manifest_org,
+        content_view=module_sca_manifest_org.default_content_view.id,
+        environment=module_sca_manifest_org.library.id,
+        organization=module_sca_manifest_org,
     ).create()
     return activation_key
 

pytest_fixtures/component/provision_capsule_pxe.py

@@ -0,0 +1,272 @@
+import ipaddress
+
+from box import Box
+from broker import Broker
+from fauxfactory import gen_string
+from packaging.version import Version
+import pytest
+
+from robottelo import constants
+from robottelo.config import settings
+
+
+@pytest.fixture(scope='module')
+def capsule_provisioning_sat(
+    request,
+    module_target_sat,
+    module_sca_manifest_org,
+    module_location,
+    module_capsule_configured,
+):
+    """
+    This fixture sets up the Satellite for PXE provisioning.
+    It calls a workflow using broker to set up the network and to run satellite-installer.
+    It uses the artifacts from the workflow to create all the necessary Satellite entities
+    that are later used by the tests.
+    """
+    # Assign org and loc
+    capsule = module_capsule_configured.nailgun_smart_proxy
+    capsule.location = [module_location]
+    capsule.update(['location'])
+    capsule.organization = [module_sca_manifest_org]
+    capsule.update(['organization'])
+
+    provisioning_type = getattr(request, 'param', '')
+    sat = module_target_sat
+    provisioning_domain_name = f"{gen_string('alpha').lower()}.foo"
+    broker_data_out = Broker().execute(
+        workflow='configure-install-sat-provisioning-rhv',
+        artifacts='last',
+        target_vlan_id=settings.provisioning.vlan_id,
+        target_host=module_capsule_configured.name,
+        provisioning_dns_zone=provisioning_domain_name,
+        sat_version='stream' if sat.is_stream else sat.version,
+        deploy_scenario='capsule',
+    )
+
+    broker_data_out = Box(**broker_data_out['data_out'])
+    provisioning_interface = ipaddress.ip_interface(broker_data_out.provisioning_addr_ipv4)
+    provisioning_network = provisioning_interface.network
+    # TODO: investigate DNS setup issue on Satellite,
+    # we might need to set up Sat's DNS server as the primary one on the Sat host
+    provisioning_upstream_dns_primary = (
+        broker_data_out.provisioning_upstream_dns.pop()
+    )  # There should always be at least one upstream DNS
+    provisioning_upstream_dns_secondary = (
+        broker_data_out.provisioning_upstream_dns.pop()
+        if len(broker_data_out.provisioning_upstream_dns)
+        else None
+    )
+    domain = sat.api.Domain(
+        location=[module_location],
+        organization=[module_sca_manifest_org],
+        dns=capsule.id,
+        name=provisioning_domain_name,
+    ).create()
+
+    subnet = sat.api.Subnet(
+        location=[module_location],
+        organization=[module_sca_manifest_org],
+        network=str(provisioning_network.network_address),
+        mask=str(provisioning_network.netmask),
+        gateway=broker_data_out.provisioning_gw_ipv4,
+        from_=broker_data_out.provisioning_host_range_start,
+        to=broker_data_out.provisioning_host_range_end,
+        dns_primary=provisioning_upstream_dns_primary,
+        dns_secondary=provisioning_upstream_dns_secondary,
+        boot_mode='DHCP',
+        ipam='DHCP',
+        dhcp=capsule.id,
+        tftp=capsule.id,
+        template=capsule.id,
+        dns=capsule.id,
+        httpboot=capsule.id,
+        # discovery=capsule.id,
+        remote_execution_proxy=[capsule.id],
+        domain=[domain.id],
+    ).create()
+
+    return Box(
+        sat=sat,
+        domain=domain,
+        subnet=subnet,
+        provisioning_type=provisioning_type,
+        broker_data=broker_data_out,
+    )
+
+
+@pytest.fixture(scope='module')
+def capsule_provisioning_lce_sync_setup(module_capsule_configured, module_lce_library):
+    """This fixture adds the lifecycle environment to the capsule and syncs the content"""
+    module_capsule_configured.nailgun_capsule.content_add_lifecycle_environment(
+        data={'environment_id': module_lce_library.id}
+    )
+    sync_status = module_capsule_configured.nailgun_capsule.content_sync(timeout=600)
+    assert sync_status['result'] == 'success', 'Capsule sync task failed.'
+
+
+@pytest.fixture
+def capsule_provisioning_hostgroup(
+    module_target_sat,
+    capsule_provisioning_sat,
+    module_sca_manifest_org,
+    module_location,
+    default_architecture,
+    capsule_provisioning_rhel_content,
+    module_lce_library,
+    default_partitiontable,
+    pxe_loader,
+    module_capsule_configured,
+):
+    capsule = module_capsule_configured.nailgun_smart_proxy
+    provisioning_ip = capsule_provisioning_sat.broker_data.provisioning_addr_ipv4
+    provisioning_ip = ipaddress.ip_interface(provisioning_ip).ip
+    return capsule_provisioning_sat.sat.api.HostGroup(
+        organization=[module_sca_manifest_org],
+        location=[module_location],
+        architecture=default_architecture,
+        domain=capsule_provisioning_sat.domain,
+        content_source=capsule.id,
+        content_view=capsule_provisioning_rhel_content.cv,
+        kickstart_repository=capsule_provisioning_rhel_content.ksrepo,
+        lifecycle_environment=module_lce_library,
+        root_pass=settings.provisioning.host_root_password,
+        operatingsystem=capsule_provisioning_rhel_content.os,
+        ptable=default_partitiontable,
+        subnet=capsule_provisioning_sat.subnet,
+        pxe_loader=pxe_loader.pxe_loader,
+        group_parameters_attributes=[
+            {
+                'name': 'remote_execution_ssh_keys',
+                'parameter_type': 'string',
+                'value': settings.provisioning.host_ssh_key_pub,
+            },
+            # assign AK in order the hosts to be subscribed
+            {
+                'name': 'kt_activation_keys',
+                'parameter_type': 'string',
+                'value': capsule_provisioning_rhel_content.ak.name,
+            },
+            {
+                'name': 'http_proxy',
+                'parameter_type': 'string',
+                'value': str(provisioning_ip),
+            },
+            {
+                'name': 'http_proxy_port',
+                'parameter_type': 'string',
+                'value': '80',
+            },
+        ],
+    ).create()
+
+
+@pytest.fixture(scope='module')
+def capsule_provisioning_rhel_content(
+    request,
+    capsule_provisioning_sat,
+    module_sca_manifest_org,
+    module_lce_library,
+):
+    """
+    This fixture sets up kickstart repositories for a specific RHEL version
+    that is specified in `request.param`.
+    """
+    sat = capsule_provisioning_sat.sat
+    rhel_ver = request.param['rhel_version']
+    repo_names = []
+    if int(rhel_ver) <= 7:
+        repo_names.append(f'rhel{rhel_ver}')
+    else:
+        repo_names.append(f'rhel{rhel_ver}_bos')
+        repo_names.append(f'rhel{rhel_ver}_aps')
+    rh_repos = []
+    tasks = []
+    rh_repo_id = ""
+    content_view = sat.api.ContentView(organization=module_sca_manifest_org).create()
+
+    # Custom Content for Client repo
+    custom_product = sat.api.Product(
+        organization=module_sca_manifest_org, name=f'rhel{rhel_ver}_{gen_string("alpha")}'
+    ).create()
+    client_repo = sat.api.Repository(
+        organization=module_sca_manifest_org,
+        product=custom_product,
+        content_type='yum',
+        url=settings.repos.SATCLIENT_REPO[f'rhel{rhel_ver}'],
+    ).create()
+    task = client_repo.sync(synchronous=False)
+    tasks.append(task)
+    content_view.repository = [client_repo]
+
+    for name in repo_names:
+        rh_kickstart_repo_id = sat.api_factory.enable_rhrepo_and_fetchid(
+            basearch=constants.DEFAULT_ARCHITECTURE,
+            org_id=module_sca_manifest_org.id,
+            product=constants.REPOS['kickstart'][name]['product'],
+            repo=constants.REPOS['kickstart'][name]['name'],
+            reposet=constants.REPOS['kickstart'][name]['reposet'],
+            releasever=constants.REPOS['kickstart'][name]['version'],
+        )
+        # do not sync content repos for discovery based provisioning.
+        if not capsule_provisioning_sat.provisioning_type == 'discovery':
+            rh_repo_id = sat.api_factory.enable_rhrepo_and_fetchid(
+                basearch=constants.DEFAULT_ARCHITECTURE,
+                org_id=module_sca_manifest_org.id,
+                product=constants.REPOS[name]['product'],
+                repo=constants.REPOS[name]['name'],
+                reposet=constants.REPOS[name]['reposet'],
+                releasever=constants.REPOS[name]['releasever'],
+            )
+
+        # Sync step because repo is not synced by default
+        for repo_id in [rh_kickstart_repo_id, rh_repo_id]:
+            if repo_id:
+                rh_repo = sat.api.Repository(id=repo_id).read()
+                task = rh_repo.sync(synchronous=False)
+                tasks.append(task)
+                rh_repos.append(rh_repo)
+                content_view.repository.append(rh_repo)
+                content_view.update(['repository'])
+    for task in tasks:
+        sat.wait_for_tasks(
+            search_query=(f'id = {task["id"]}'),
+            poll_timeout=2500,
+        )
+        task_status = sat.api.ForemanTask(id=task['id']).poll()
+        assert task_status['result'] == 'success'
+    rhel_xy = Version(
+        constants.REPOS['kickstart'][f'rhel{rhel_ver}']['version']
+        if rhel_ver == 7
+        else constants.REPOS['kickstart'][f'rhel{rhel_ver}_bos']['version']
+    )
+    o_systems = sat.api.OperatingSystem().search(
+        query={'search': f'family=Redhat and major={rhel_xy.major} and minor={rhel_xy.minor}'}
+    )
+    assert o_systems, f'Operating system RHEL {rhel_xy} was not found'
+    os = o_systems[0].read()
+    # return only the first kickstart repo - RHEL X KS or RHEL X BaseOS KS
+    ksrepo = rh_repos[0]
+    publish = content_view.publish()
+    task_status = sat.wait_for_tasks(
+        search_query=(f'Actions::Katello::ContentView::Publish and id = {publish["id"]}'),
+        search_rate=15,
+        max_tries=10,
+    )
+    assert task_status[0].result == 'success'
+    content_view = sat.api.ContentView(
+        organization=module_sca_manifest_org, name=content_view.name
+    ).search()[0]
+    ak = sat.api.ActivationKey(
+        organization=module_sca_manifest_org,
+        content_view=content_view,
+        environment=module_lce_library,
+    ).create()
+
+    # Ensure client repo is enabled in the activation key
+    content = ak.product_content(data={'content_access_mode_all': '1'})['results']
+    client_repo_label = [repo['label'] for repo in content if repo['name'] == client_repo.name][0]
+    ak.content_override(
+        data={'content_overrides': [{'content_label': client_repo_label, 'value': '1'}]}
+    )
+    return Box(os=os, ak=ak, ksrepo=ksrepo, cv=content_view)