diff --git a/action.yml b/action.yml index 78c020b..c2ed6f0 100644 --- a/action.yml +++ b/action.yml @@ -9,7 +9,7 @@ inputs: description: '' required: true os_test: - description: 'centos7/c8s/c9s/fedora/rhel7/rhel8/rhel9/rhel9-unsubscribed' + description: 'c9s/c10s/fedora/rhel8/rhel9/rhel9-unsubscribed' required: true test_case: description: 'container/openshift-4' diff --git a/export_variables.sh b/export_variables.sh index 1a6c859..d680971 100755 --- a/export_variables.sh +++ b/export_variables.sh @@ -1,7 +1,7 @@ #!/bin/sh -public_ranch="centos7 c8s c9s c10s fedora" -private_ranch="rhel7 rhel8 rhel9 rhel9-unsubscribed" +public_ranch="c8s c9s c10s fedora" +private_ranch="rhel8 rhel9 rhel9-unsubscribed" all_os="$public_ranch $private_ranch" os_test="$1" # options: centos7, c8s, c9s, fedora, rhel7, rhel8, rhel9, rhel9-unsubscribed @@ -58,37 +58,21 @@ fi # variables based on operating system in test dockerfile=Dockerfile."$os_test" case "$os_test" in - "centos7") - tmt_plan="centos7" - context="$context_prefix CentOS7$context_suffix" - dockerfile="Dockerfile" - compose="CentOS-7" - ;; - "c10s") - tmt_plan="c10s" - context="$context_prefix CentOS Stream 10" - compose="CentOS-Stream-10" - ;; "c9s") tmt_plan="c9s" context="$context_prefix CentOS Stream 9" compose="CentOS-Stream-9" ;; - "c8s") - tmt_plan="c8s" - context="$context_prefix CentOS Stream 8" - compose="CentOS-Stream-8" + "c10s") + tmt_plan="c10s" + context="$context_prefix CentOS Stream 10" + compose="CentOS-Stream-10" ;; "fedora") tmt_plan="fedora" context="Fedora" compose="Fedora-latest" ;; - "rhel7") - tmt_plan="rhel7$tmt_plan_suffix" - context="$context_prefix RHEL7$context_suffix" - compose="RHEL-7-LatestUpdated" - ;; "rhel8") tmt_plan="rhel8$tmt_plan_suffix" context="$context_prefix RHEL8$context_suffix"