From 2c4bc65d5dfaa3e42ee605ca630300294523d8b2 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 18 Sep 2025 10:35:43 +0200 Subject: [PATCH 1/2] Add dependency Dancer2::Template::Simple It was removed from Dancer2 core since 2.0.0 --- cpanfile | 1 + 1 file changed, 1 insertion(+) diff --git a/cpanfile b/cpanfile index bb9d060..0f5bac1 100644 --- a/cpanfile +++ b/cpanfile @@ -1,5 +1,6 @@ requires "Dancer2" => "0.160001"; requires "Dancer2::Plugin::Database" => "0"; +requires "Dancer2::Template::Simple" => "0"; requires 'DBD::MariaDB' => '0'; requires "YAML::XS" => "0"; requires "Template" => "0"; From 14ae3c8cc5889aee8307c64b350ecbaa9b08e03f Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 22 Sep 2025 15:39:34 +0200 Subject: [PATCH 2/2] Specify Dancer2 -> "0" Add also reference to PR_NUMBER instead of master Signed-off-by: Petr "Stone" Hracek --- cpanfile | 2 +- tests/test_dancer.py | 6 ++++-- tests/test_dancer_mysql.py | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cpanfile b/cpanfile index 0f5bac1..ad23c35 100644 --- a/cpanfile +++ b/cpanfile @@ -1,4 +1,4 @@ -requires "Dancer2" => "0.160001"; +requires "Dancer2" => "0"; requires "Dancer2::Plugin::Database" => "0"; requires "Dancer2::Template::Simple" => "0"; requires 'DBD::MariaDB' => '0'; diff --git a/tests/test_dancer.py b/tests/test_dancer.py index fe5cdbe..a2107fa 100644 --- a/tests/test_dancer.py +++ b/tests/test_dancer.py @@ -10,6 +10,8 @@ VERSION=os.getenv("SINGLE_VERSION") OS=os.getenv("OS") +PR_NUMBER=os.getenv("PR_NUMBER") + TAG = TAGS.get(OS) @@ -36,7 +38,7 @@ def test_local_template_inside_cluster(self): name_in_template="dancer-example", expected_output=expected_output, openshift_args=[ - "SOURCE_REPOSITORY_REF=master", + f"SOURCE_REPOSITORY_REF=refs/pull/{PR_NUMBER}/head", f"PERL_VERSION={VERSION}{TAG}", "NAME=dancer-example" ] @@ -56,7 +58,7 @@ def test_template_inside_cluster(self): assert self.oc_api.deploy_template( template=template_json, name_in_template="dancer-example", expected_output=expected_output, openshift_args=[ - "SOURCE_REPOSITORY_REF=master", + f"SOURCE_REPOSITORY_REF=refs/pull/{PR_NUMBER}/head", f"PERL_VERSION={VERSION}{TAG}", "NAME=dancer-example"] ) diff --git a/tests/test_dancer_mysql.py b/tests/test_dancer_mysql.py index c54a9f8..b2b3134 100644 --- a/tests/test_dancer_mysql.py +++ b/tests/test_dancer_mysql.py @@ -10,6 +10,8 @@ VERSION=os.getenv("SINGLE_VERSION") OS=os.getenv("OS") +PR_NUMBER=os.getenv("PR_NUMBER") + TAG = TAGS.get(OS) @@ -37,7 +39,7 @@ def test_local_template_inside_cluster(self): assert self.oc_api.deploy_template( template=template_json, name_in_template="dancer-example", expected_output=expected_output, openshift_args=[ - "SOURCE_REPOSITORY_REF=master", + f"SOURCE_REPOSITORY_REF=refs/pull/{PR_NUMBER}/head", f"PERL_VERSION={VERSION}{TAG}", "NAME=dancer-example", "MYSQL_VERSION=8.0-el8" @@ -58,7 +60,7 @@ def test_template_inside_cluster(self): assert self.oc_api.deploy_template( template=template_json, name_in_template="dancer-example", expected_output=expected_output, openshift_args=[ - "SOURCE_REPOSITORY_REF=master", + f"SOURCE_REPOSITORY_REF=refs/pull/{PR_NUMBER}/head", f"PERL_VERSION={VERSION}{TAG}", "NAME=dancer-example", "MYSQL_VERSION=8.0-el8"