Skip to content

Commit

Permalink
Merge branch 'SatelliteQE:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
shweta83 authored Jun 26, 2024
2 parents d8b5c05 + 468a0f9 commit 4198aa7
Show file tree
Hide file tree
Showing 518 changed files with 9,312 additions and 9,561 deletions.
71 changes: 71 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,74 @@
/scripts/ @SatelliteQE/robottelo-tier-2-reviewers

/tests/foreman/sanity/ @SatelliteQE/robottelo-tier-2-reviewers

# Team Codeowners for test based changes

# Phoenix
/tests/foreman/api/test_activationkey.py @SatelliteQE/phoenix
/tests/foreman/api/test_capsulecontent.py @SatelliteQE/phoenix
/tests/foreman/api/test_contentcredentials.py @SatelliteQE/phoenix
/tests/foreman/api/test_contentviewfilter.py @SatelliteQE/phoenix
/tests/foreman/api/test_contentview.py @SatelliteQE/phoenix
/tests/foreman/api/test_contentviewversion.py @SatelliteQE/phoenix
/tests/foreman/api/test_docker.py @SatelliteQE/phoenix
/tests/foreman/api/test_errata.py @SatelliteQE/phoenix
/tests/foreman/api/test_hostcollection.py @SatelliteQE/phoenix
/tests/foreman/api/test_http_proxy.py @SatelliteQE/phoenix
/tests/foreman/api/test_lifecycleenvironment.py @SatelliteQE/phoenix
/tests/foreman/api/test_product.py @SatelliteQE/phoenix
/tests/foreman/api/test_reporttemplates.py @SatelliteQE/phoenix
/tests/foreman/api/test_repositories.py @SatelliteQE/phoenix
/tests/foreman/api/test_repository.py @SatelliteQE/phoenix
/tests/foreman/api/test_repository_set.py @SatelliteQE/phoenix
/tests/foreman/api/test_rhsm.py @SatelliteQE/phoenix
/tests/foreman/api/test_subscription.py @SatelliteQE/phoenix
/tests/foreman/api/test_syncplan.py @SatelliteQE/phoenix
/tests/foreman/cli/test_activationkey.py @SatelliteQE/phoenix
/tests/foreman/cli/test_artifacts.py @SatelliteQE/phoenix
/tests/foreman/cli/test_capsulecontent.py @SatelliteQE/phoenix
/tests/foreman/cli/test_contentaccess.py @SatelliteQE/phoenix
/tests/foreman/cli/test_contentcredentials.py @SatelliteQE/phoenix
/tests/foreman/cli/test_contentviewfilter.py @SatelliteQE/phoenix
/tests/foreman/cli/test_contentview.py @SatelliteQE/phoenix
/tests/foreman/cli/test_docker.py @SatelliteQE/phoenix
/tests/foreman/cli/test_errata.py @SatelliteQE/phoenix
/tests/foreman/cli/test_hostcollection.py @SatelliteQE/phoenix
/tests/foreman/cli/test_http_proxy.py @SatelliteQE/phoenix
/tests/foreman/cli/test_lifecycleenvironment.py @SatelliteQE/phoenix
/tests/foreman/cli/test_ostreebranch.py @SatelliteQE/phoenix
/tests/foreman/cli/test_product.py @SatelliteQE/phoenix
/tests/foreman/cli/test_reporttemplates.py @SatelliteQE/phoenix
/tests/foreman/cli/test_repositories.py @SatelliteQE/phoenix
/tests/foreman/cli/test_repository.py @SatelliteQE/phoenix
/tests/foreman/cli/test_repository_set.py @SatelliteQE/phoenix
/tests/foreman/cli/test_satellitesync.py @SatelliteQE/phoenix
/tests/foreman/cli/test_subscription.py @SatelliteQE/phoenix
/tests/foreman/cli/test_syncplan.py @SatelliteQE/phoenix
/tests/foreman/cli/test_vm_install_products_package.py @SatelliteQE/phoenix
/tests/foreman/destructive/test_capsulecontent.py @SatelliteQE/phoenix
/tests/foreman/destructive/test_contenthost.py @SatelliteQE/phoenix
/tests/foreman/destructive/test_contentview.py @SatelliteQE/phoenix
/tests/foreman/destructive/test_repository.py @SatelliteQE/phoenix
/tests/foreman/longrun/test_inc_updates.py @SatelliteQE/phoenix
/tests/foreman/ui/test_activationkey.py @SatelliteQE/phoenix
/tests/foreman/ui/test_capsulecontent.py @SatelliteQE/phoenix
/tests/foreman/ui/test_containerimagetag.py @SatelliteQE/phoenix
/tests/foreman/ui/test_contentcredentials.py @SatelliteQE/phoenix
/tests/foreman/ui/test_contenthost.py @SatelliteQE/phoenix
/tests/foreman/ui/test_contentview_old.py @SatelliteQE/phoenix
/tests/foreman/ui/test_contentview.py @SatelliteQE/phoenix
/tests/foreman/ui/test_errata.py @SatelliteQE/phoenix
/tests/foreman/ui/test_hostcollection.py @SatelliteQE/phoenix
/tests/foreman/ui/test_http_proxy.py @SatelliteQE/phoenix
/tests/foreman/ui/test_lifecycleenvironment.py @SatelliteQE/phoenix
/tests/foreman/ui/test_modulestreams.py @SatelliteQE/phoenix
/tests/foreman/ui/test_package.py @SatelliteQE/phoenix
/tests/foreman/ui/test_product.py @SatelliteQE/phoenix
/tests/foreman/ui/test_reporttemplates.py @SatelliteQE/phoenix
/tests/foreman/ui/test_repositories.py @SatelliteQE/phoenix
/tests/foreman/ui/test_repository.py @SatelliteQE/phoenix
/tests/foreman/ui/test_subscription.py @SatelliteQE/phoenix
/tests/foreman/ui/test_syncplan.py @SatelliteQE/phoenix
/tests/foreman/ui/test_sync.py @SatelliteQE/phoenix
/tests/foreman/virtwho/ @SatelliteQE/phoenix
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions .github/dependency_tests.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
broker[docker]: "tests/foreman/ -k 'test_host_registration_end_to_end or test_positive_erratum_applicability or test_positive_upload_content'"
broker[docker,podman,hussh]: "tests/foreman/ -k 'test_host_registration_end_to_end or test_positive_erratum_applicability or test_positive_upload_content'"
deepdiff: "tests/foreman/endtoend/test_api_endtoend.py -k 'test_positive_get_links'"
dynaconf[vault]: "tests/foreman/api/test_ldapauthsource.py -k 'test_positive_endtoend'"
manifester: "tests/foreman/api/test_subscription.py -k 'test_positive_create_after_refresh'"
manifester: "tests/foreman/cli/test_contentview.py -k 'test_positive_promote_rh_content'"
navmazing: "tests/foreman/ui/test_repository.py -k 'test_positive_create_as_non_admin_user'"
pyotp: "tests/foreman/ui/test_ldap_authentication.py -k 'test_positive_login_user_password_otp'"
pytest-xdist: "tests/foreman/ -n 3 -m 'build_sanity'"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto_cherry_pick_merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- id: automerge
name: Auto merge of cherry-picked PRs.
uses: "pascalgn/[email protected].2"
uses: "pascalgn/[email protected].3"
env:
GITHUB_TOKEN: "${{ secrets.CHERRYPICK_PAT }}"
MERGE_LABELS: "AutoMerge_Cherry_Picked, Auto_Cherry_Picked"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:

- id: automerge
name: Auto merge of dependabot PRs.
uses: "pascalgn/[email protected].2"
uses: "pascalgn/[email protected].3"
env:
GITHUB_TOKEN: "${{ secrets.CHERRYPICK_PAT }}"
MERGE_LABELS: "dependencies"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
env:
PYCURL_SSL_LIBRARY: openssl
ROBOTTELO_BUGZILLA__API_KEY: ${{ secrets.BUGZILLA_KEY }}
ROBOTTELO_JIRA__API_KEY: ${{ secrets.JIRA_KEY }}
ROBOTTELO_ROBOTTELO__SETTINGS__IGNORE_VALIDATION_ERRORS: true

jobs:
codechecks:
Expand Down Expand Up @@ -41,9 +43,6 @@ jobs:
cp broker_settings.yaml.example broker_settings.yaml
cp .env.example .env
- name: Pre Commit Checks
uses: pre-commit/[email protected]

- name: Collect Tests
run: |
# To skip vault login in pull request checks
Expand All @@ -64,6 +63,7 @@ jobs:
run: |
# To skip vault login in pull request checks
export VAULT_SECRET_ID_FOR_DYNACONF=somesecret
export ROBOTTELO_SERVER__HOSTNAME=""
pytest -sv tests/robottelo/
- name: Make Docs
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ jobs:
id: cscheck
env:
ROBOTTELO_BUGZILLA__API_KEY: ${{ secrets.BUGZILLA_KEY }}
ROBOTTELO_JIRA__API_KEY: ${{ secrets.JIRA_KEY }}

- name: Customer scenario status
run: |
Expand Down
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# configuration for pre-commit git hooks

ci:
autofix_prs: false # disable autofixing PRs

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.6.0
hooks:
- id: trailing-whitespace
exclude: tests/foreman/data/
- id: check-yaml
- id: debug-statements
- repo: https://github.com/psf/black
rev: 22.10.0
hooks:
- id: black
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.3.0
rev: v0.4.10
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
- id: ruff-format
- repo: local
hooks:
- id: fix-uuids
Expand All @@ -28,6 +28,6 @@ repos:
types: [text]
require_serial: true
- repo: https://github.com/gitleaks/gitleaks
rev: v8.18.0
rev: v8.18.4
hooks:
- id: gitleaks
1 change: 1 addition & 0 deletions conf/capsule.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ CAPSULE:
OS: deploy-rhel # workflow to deploy OS that is ready to run the product
# Dictionary of arguments which should be passed along to the deploy workflow
DEPLOY_ARGUMENTS:
# deploy_network_type: '@jinja {{"ipv6" if this.server.is_ipv6 else "ipv4"}}'
6 changes: 0 additions & 6 deletions conf/certs.yaml.template

This file was deleted.

5 changes: 0 additions & 5 deletions conf/clients.yaml.template

This file was deleted.

3 changes: 0 additions & 3 deletions conf/discovery.yaml.template

This file was deleted.

6 changes: 0 additions & 6 deletions conf/distro.yaml.template

This file was deleted.

3 changes: 2 additions & 1 deletion conf/dynaconf_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from robottelo.logging import logger
from robottelo.utils.ohsnap import dogfood_repository
from robottelo.utils.url import is_url
from robottelo.utils.url import ipv6_hostname_translation, is_url


def post(settings):
Expand All @@ -26,6 +26,7 @@ def post(settings):
)
data = get_repos_config(settings)
write_cache(settings_cache_path, data)
ipv6_hostname_translation(settings, data)
config_migrations(settings, data)
data['dynaconf_merge'] = True
return data
Expand Down
101 changes: 101 additions & 0 deletions conf/fam.yaml.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
FAM:
SERVER:
# Parameter for all tests
foreman_username: admin
foreman_password: "changeme"
foreman_server_url: "https://foreman.example.com"
foreman_validate_certs: false

foreman_proxy: "foreman.example.com"

# Parameter for snapshot test
snapshot_host_name: "test_host"

# Parameter for job invocation test
foreman_host: "foreman.example.com"

# Parameter for subscription_manifest test
subscription_manifest_path: "data/manifest_foreman-ansible-modules.zip"

# Parameter for redhat_manifest test
manifest_name: "katello.example.com"
rhsm_username: "john-smith"
rhsm_password: "changeme"
rhsm_pool_id: 8a85f99a7db4827d017dc512fcad00b0
rhsm_validate_certs: false

# Parameter for scc_product test
scc_account_name_for_scc_product: testaccount
scc_account_login_for_scc_product: testuser
scc_account_password_for_scc_product: testpass

# Parameter for external_usergroup testing
auth_source_ldap_host: ldap.example.com
auth_source_ldap_account: ansible
auth_source_ldap_account_password: pass
auth_source_ldap_base_dn: dc=example,dc=com
auth_source_ldap_attr_login: uid
auth_source_ldap_groups_base: cn=groups,cn=accounts,dc=example,dc=com
external_usergroup_name: "admins"

COMPUTE_PROFILE:
libvirt:
compute_resource:
name: libvirt-cr01
organizations:
- Test Organization
locations:
- Test Location
params:
url: qemu+ssh://libvirtuser@localhost/system
compute_profile:
name: app-small
attrs:
cpus: 1
memory: 2147483648
nics_attributes:
0:
type: bridge
bridge: ""
model: virtio
volumes_attributes:
0:
pool_name: default
capacity: 10G
allocation: 0G
format_type: raw
ovirt:
compute_resource:
name: ovirt-cr01
organizations:
- Test Organization
locations:
- Test Location
params:
url: "https://ovirt.example.com/ovirt-engine/api"
user: compute-user@internal
password: ovirtcompute123
use_v4: true
datacenter: c1479626-99a2-44eb-8401-14b5630f417f
ovirt_quota: 502a76bb-a3fe-42f1-aed6-2a7c892a6786
compute_profile:
name: app-small
attrs:
cluster: Devel-Infra
cores: 2
sockets: 1
memory: 1073741824
ha: 0
interfaces_attributes:
0:
name: ""
network: ovirtmgmt
interface: virtio
volumes_attributes:
0:
size_gb: '16'
storage_domain: 'Local-IBM'
preallocate: '1'
wipe_after_delete: '0'
interface: 'virtio_scsi'
bootable: 'true'
10 changes: 10 additions & 0 deletions conf/jira.yaml.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
JIRA:
# url default value is set to 'https://issues.redhat.com' even if not provided.
URL: https://issues.redhat.com
# Provide api_key to access Jira REST API
API_KEY: replace-with-jira-api-key
COMMENT_TYPE: group
COMMENT_VISIBILITY: "Red Hat Employee"
ENABLE_COMMENT: false
# Comment only if jira is in one of the following state
ISSUE_STATUS: ["Review", "Release Pending"]
6 changes: 4 additions & 2 deletions conf/oscap.yaml.template
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
OSCAP:
CONTENT_PATH: /usr/share/xml/scap/ssg/content/ssg-rhel7-ds.xml
RHEL_MAJOR_VERSION: "@jinja {{this.server.version.rhel_version | int }}"
CONTENT_PATH: '@format /usr/share/xml/scap/ssg/content/ssg-rhel{this.oscap.rhel_major_version}-ds.xml'
# see: robottelo/constants/__init__.py OSCAP_PROFILE
PROFILE: security7
PROFILE: '@format security{this.oscap.rhel_major_version}'
CONTENT_DIR: /usr/share/xml/scap/ssg/content
2 changes: 2 additions & 0 deletions conf/provisioning.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ PROVISIONING:
HOST_ROOT_PASSWORD:
HOST_SSH_KEY_PRIV:
HOST_SSH_KEY_PUB:
PROVISIONING_SAT_WORKFLOW:
PROVISIONING_HOST_WORKFLOW:
5 changes: 3 additions & 2 deletions conf/robottelo.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ 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"
RHEL_VERSION: "8.10"
# Dynaconf and Dynaconf hooks related options
SETTINGS:
GET_FRESH: true
IGNORE_VALIDATION_ERRORS: false
Loading

0 comments on commit 4198aa7

Please sign in to comment.