diff --git a/cpanfile b/cpanfile index bb9d060..ad23c35 100644 --- a/cpanfile +++ b/cpanfile @@ -1,5 +1,6 @@ -requires "Dancer2" => "0.160001"; +requires "Dancer2" => "0"; requires "Dancer2::Plugin::Database" => "0"; +requires "Dancer2::Template::Simple" => "0"; requires 'DBD::MariaDB' => '0'; requires "YAML::XS" => "0"; requires "Template" => "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"