forked from rpms/leapp-repository
323 lines
11 KiB
Diff
323 lines
11 KiB
Diff
From e330fef6ef748dd1ae1ca1f4ec2a4142818d1e43 Mon Sep 17 00:00:00 2001
|
|
From: Tomas Fratrik <tomasfratrik8@gmail.com>
|
|
Date: Mon, 14 Apr 2025 14:40:19 +0200
|
|
Subject: [PATCH 19/37] Remove 7to8 CI tests
|
|
|
|
Removing 7to8 CI tests because the upgrade path from RHEL-7 to RHEL-8 is no longer supported.
|
|
|
|
Jira: RHELMISC-11004
|
|
---
|
|
.github/workflows/reuse-copr-build.yml | 4 +-
|
|
.github/workflows/tmt-tests.yml | 59 ----------
|
|
.github/workflows/unit-tests.yml | 17 ---
|
|
.packit.yaml | 152 -------------------------
|
|
4 files changed, 2 insertions(+), 230 deletions(-)
|
|
|
|
diff --git a/.github/workflows/reuse-copr-build.yml b/.github/workflows/reuse-copr-build.yml
|
|
index c6702e1a..a772fb64 100644
|
|
--- a/.github/workflows/reuse-copr-build.yml
|
|
+++ b/.github/workflows/reuse-copr-build.yml
|
|
@@ -56,7 +56,7 @@ jobs:
|
|
id: copr_build
|
|
env:
|
|
COPR_CONFIG: "copr_fedora.conf"
|
|
- COPR_CHROOT: "epel-7-x86_64,epel-8-x86_64"
|
|
+ COPR_CHROOT: "epel-8-x86_64"
|
|
COPR_REPO: "@oamg/leapp"
|
|
run: |
|
|
cat << EOF > $COPR_CONFIG
|
|
@@ -122,7 +122,7 @@ jobs:
|
|
if: ${{ steps.leapp_pr_regex_match.outputs.match != '' }}
|
|
env:
|
|
COPR_CONFIG: "copr_fedora.conf"
|
|
- COPR_CHROOT: "epel-7-x86_64,epel-8-x86_64"
|
|
+ COPR_CHROOT: "epel-8-x86_64"
|
|
COPR_REPO: "@oamg/leapp"
|
|
run: |
|
|
cat << EOF > $COPR_CONFIG
|
|
diff --git a/.github/workflows/tmt-tests.yml b/.github/workflows/tmt-tests.yml
|
|
index 1fa00e60..c9f76ef7 100644
|
|
--- a/.github/workflows/tmt-tests.yml
|
|
+++ b/.github/workflows/tmt-tests.yml
|
|
@@ -10,65 +10,6 @@ jobs:
|
|
uses: ./.github/workflows/reuse-copr-build.yml
|
|
secrets: inherit
|
|
|
|
- call_workflow_tests_79to88_integration:
|
|
- needs: call_workflow_copr_build
|
|
- uses: oamg/leapp/.github/workflows/reuse-tests-7to8.yml@main
|
|
- secrets: inherit
|
|
- with:
|
|
- copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
|
|
- tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*max_sst)"
|
|
- pull_request_status_name: "7.9to8.8"
|
|
- variables: 'SOURCE_RELEASE=7.9;TARGET_RELEASE=8.8;LEAPPDATA_BRANCH=upstream'
|
|
- if: |
|
|
- github.event.issue.pull_request
|
|
- && ! startsWith(github.event.comment.body, '/rerun-sst')
|
|
- && contains(fromJson('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association)
|
|
-
|
|
- call_workflow_tests_79to86_integration:
|
|
- needs: call_workflow_copr_build
|
|
- uses: oamg/leapp/.github/workflows/reuse-tests-7to8.yml@main
|
|
- secrets: inherit
|
|
- with:
|
|
- copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
|
|
- tmt_plan_regex: "^(?!.*max_sst)(.*tier1)"
|
|
- variables: 'SOURCE_RELEASE=7.9;TARGET_RELEASE=8.6;LEAPPDATA_BRANCH=upstream'
|
|
- pull_request_status_name: "7.9to8.6"
|
|
- if: |
|
|
- github.event.issue.pull_request
|
|
- && ! startsWith(github.event.comment.body, '/rerun-sst')
|
|
- && contains(fromJson('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association)
|
|
-
|
|
- call_workflow_tests_79to88_sst:
|
|
- needs: call_workflow_copr_build
|
|
- uses: oamg/leapp/.github/workflows/reuse-tests-7to8.yml@main
|
|
- secrets: inherit
|
|
- with:
|
|
- copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
|
|
- tmt_plan_regex: "^(?!.*tier[2-3].*)(.*max_sst.*)"
|
|
- pull_request_status_name: "7.9to8.8-sst"
|
|
- update_pull_request_status: 'false'
|
|
- variables: 'SOURCE_RELEASE=7.9;TARGET_RELEASE=8.8;LEAPPDATA_BRANCH=upstream'
|
|
- if: |
|
|
- github.event.issue.pull_request
|
|
- && startsWith(github.event.comment.body, '/rerun-sst')
|
|
- && contains(fromJson('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association)
|
|
-
|
|
- call_workflow_tests_7to8_aws:
|
|
- needs: call_workflow_copr_build
|
|
- uses: oamg/leapp/.github/workflows/reuse-tests-7to8.yml@main
|
|
- secrets: inherit
|
|
- with:
|
|
- copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
|
|
- tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)"
|
|
- compose: "RHEL-7.9-rhui"
|
|
- environment_settings: '{"provisioning": {"post_install_script": "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; echo 42; yum-config-manager --enable rhel-7-server-rhui-optional-rpms"}}'
|
|
- pull_request_status_name: "7to8-aws-e2e"
|
|
- variables: "SOURCE_RELEASE=7.9;TARGET_RELEASE=8.6;RHUI=aws;LEAPPDATA_BRANCH=upstream"
|
|
- if: |
|
|
- github.event.issue.pull_request
|
|
- && ! startsWith(github.event.comment.body, '/rerun-sst')
|
|
- && contains(fromJson('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association)
|
|
-
|
|
call_workflow_tests_86to90_integration:
|
|
needs: call_workflow_copr_build
|
|
uses: oamg/leapp/.github/workflows/reuse-tests-8to9.yml@main
|
|
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
|
|
index 42b72b8d..37748396 100644
|
|
--- a/.github/workflows/unit-tests.yml
|
|
+++ b/.github/workflows/unit-tests.yml
|
|
@@ -49,23 +49,6 @@ jobs:
|
|
python: python3.6
|
|
repos: 'el8toel9,common'
|
|
container: ubi8-lint
|
|
- # 7to8
|
|
- - name: Run unit tests for el7toel8 and common repositories on python 3.6
|
|
- python: python3.6
|
|
- repos: 'el7toel8,common'
|
|
- container: ubi8
|
|
- - name: Run python linters for el7toel8 and common repositories on python 3.6
|
|
- python: python3.6
|
|
- repos: 'el7toel8,common'
|
|
- container: ubi8-lint
|
|
- - name: Run unit tests for el7toel8 and common repositories on python 2.7
|
|
- python: python2.7
|
|
- repos: 'el7toel8,common'
|
|
- container: ubi7
|
|
- - name: Run python linters for el7toel8 and common repositories on python 2.7
|
|
- python: python2.7
|
|
- repos: 'el7toel8,common'
|
|
- container: ubi7-lint
|
|
|
|
steps:
|
|
- name: Checkout code
|
|
diff --git a/.packit.yaml b/.packit.yaml
|
|
index dd17303a..75788a25 100644
|
|
--- a/.packit.yaml
|
|
+++ b/.packit.yaml
|
|
@@ -32,7 +32,6 @@ jobs:
|
|
owner: "@oamg"
|
|
project: leapp
|
|
targets:
|
|
- - epel-7-x86_64
|
|
- epel-8-x86_64
|
|
- epel-9-x86_64
|
|
actions:
|
|
@@ -53,7 +52,6 @@ jobs:
|
|
owner: "@oamg"
|
|
project: leapp
|
|
targets:
|
|
- - epel-7-x86_64
|
|
- epel-8-x86_64
|
|
- epel-9-x86_64
|
|
actions:
|
|
@@ -73,7 +71,6 @@ jobs:
|
|
owner: "@oamg"
|
|
project: leapp
|
|
targets:
|
|
- - epel-7-x86_64
|
|
- epel-8-x86_64
|
|
- epel-9-x86_64
|
|
actions:
|
|
@@ -95,155 +92,6 @@ jobs:
|
|
# >7tox path https://gitlab.cee.redhat.com/oamg/leapp-tests/-/blob/main/config.yaml
|
|
# Available only to RH Employees.
|
|
|
|
-# ###################################################################### #
|
|
-# ############################### 7 TO 8 ############################### #
|
|
-# ###################################################################### #
|
|
-
|
|
-# ###################################################################### #
|
|
-# ### Abstract job definitions to make individual tests/jobs smaller ### #
|
|
-# ###################################################################### #
|
|
-- &sanity-abstract-7to8
|
|
- job: tests
|
|
- trigger: ignore
|
|
- fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests"
|
|
- fmf_ref: "rhel7"
|
|
- use_internal_tf: True
|
|
- labels:
|
|
- - sanity
|
|
- targets:
|
|
- epel-7-x86_64:
|
|
- distros: [RHEL-7.9-ZStream]
|
|
- identifier: sanity-abstract-7to8
|
|
- tmt_plan: ""
|
|
-
|
|
-- &sanity-abstract-7to8-aws
|
|
- <<: *sanity-abstract-7to8
|
|
- labels:
|
|
- - sanity
|
|
- - aws
|
|
- targets:
|
|
- epel-7-x86_64:
|
|
- distros: [RHEL-7.9-rhui]
|
|
- identifier: sanity-abstract-7to8-aws
|
|
-
|
|
-# On-demand minimal beaker tests
|
|
-- &beaker-minimal-7to8-abstract-ondemand
|
|
- <<: *sanity-abstract-7to8
|
|
- manual_trigger: True
|
|
- labels:
|
|
- - beaker-minimal
|
|
- identifier: beaker-minimal-7to8-abstract-ondemand
|
|
-
|
|
-# On-demand kernel-rt tests
|
|
-- &kernel-rt-abstract-7to8-ondemand
|
|
- <<: *beaker-minimal-7to8-abstract-ondemand
|
|
- labels:
|
|
- - kernel-rt
|
|
- identifier: sanity-7to8-kernel-rt-abstract-ondemand
|
|
-
|
|
-# ###################################################################### #
|
|
-# ######################### Individual tests ########################### #
|
|
-# ###################################################################### #
|
|
-
|
|
-# Tests: 7.9 -> 8.10
|
|
-- &sanity-79to810
|
|
- <<: *sanity-abstract-7to8
|
|
- trigger: pull_request
|
|
- identifier: sanity-7.9to8.10
|
|
- tf_extra_params:
|
|
- test:
|
|
- tmt:
|
|
- plan_filter: 'tag:7to8 & tag:sanity & enabled:true'
|
|
- environments:
|
|
- - tmt:
|
|
- context:
|
|
- distro: "rhel-7.9"
|
|
- distro_target: "rhel-8.10"
|
|
- settings:
|
|
- provisioning:
|
|
- tags:
|
|
- BusinessUnit: sst_upgrades@leapp_upstream_test
|
|
- env:
|
|
- SOURCE_RELEASE: "7.9"
|
|
- TARGET_RELEASE: "8.10"
|
|
-
|
|
-- &sanity-79to810-aws
|
|
- <<: *sanity-abstract-7to8-aws
|
|
- trigger: pull_request
|
|
- identifier: sanity-7.9to8.10-aws
|
|
- tf_extra_params:
|
|
- test:
|
|
- tmt:
|
|
- plan_filter: 'tag:7to8 & tag:upgrade_happy_path & enabled:true'
|
|
- environments:
|
|
- - tmt:
|
|
- context:
|
|
- distro: "rhel-7.9"
|
|
- distro_target: "rhel-8.10"
|
|
- settings:
|
|
- provisioning:
|
|
- post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys"
|
|
- tags:
|
|
- BusinessUnit: sst_upgrades@leapp_upstream_test
|
|
- env:
|
|
- SOURCE_RELEASE: "7.9"
|
|
- TARGET_RELEASE: "8.10"
|
|
- RHUI: "aws"
|
|
- LEAPPDATA_BRANCH: "upstream"
|
|
- LEAPP_NO_RHSM: "1"
|
|
- USE_CUSTOM_REPOS: rhui
|
|
-
|
|
-- &beaker-minimal-79to810
|
|
- <<: *beaker-minimal-7to8-abstract-ondemand
|
|
- trigger: pull_request
|
|
- labels:
|
|
- - beaker-minimal
|
|
- - beaker-minimal-7.9to8.10
|
|
- - 7.9to8.10
|
|
- identifier: sanity-7.9to8.10-beaker-minimal-ondemand
|
|
- tf_extra_params:
|
|
- test:
|
|
- tmt:
|
|
- plan_filter: 'tag:7to8 & tag:partitioning & enabled:true'
|
|
- environments:
|
|
- - tmt:
|
|
- context:
|
|
- distro: "rhel-7.9"
|
|
- distro_target: "rhel-8.10"
|
|
- settings:
|
|
- provisioning:
|
|
- tags:
|
|
- BusinessUnit: sst_upgrades@leapp_upstream_test
|
|
- env:
|
|
- SOURCE_RELEASE: "7.9"
|
|
- TARGET_RELEASE: "8.10"
|
|
-
|
|
-- &kernel-rt-79to810
|
|
- <<: *kernel-rt-abstract-7to8-ondemand
|
|
- trigger: pull_request
|
|
- labels:
|
|
- - kernel-rt
|
|
- - kernel-rt-7.9to8.10
|
|
- - 7.9to8.10
|
|
- identifier: sanity-7.9to8.10-kernel-rt-ondemand
|
|
- tf_extra_params:
|
|
- test:
|
|
- tmt:
|
|
- plan_filter: 'tag:7to8 & tag:kernel-rt & enabled:true'
|
|
- environments:
|
|
- - tmt:
|
|
- context:
|
|
- distro: "rhel-7.9"
|
|
- distro_target: "rhel-8.10"
|
|
- settings:
|
|
- provisioning:
|
|
- tags:
|
|
- BusinessUnit: sst_upgrades@leapp_upstream_test
|
|
- env:
|
|
- SOURCE_RELEASE: "7.9"
|
|
- TARGET_RELEASE: "8.10"
|
|
-
|
|
-
|
|
# ###################################################################### #
|
|
# ############################## 8 TO 9 ################################ #
|
|
# ###################################################################### #
|
|
--
|
|
2.49.0
|
|
|