Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename ruby-imagestreams and ruby-rails-application for Helm charts #575

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+12 −12
Open

Rename ruby-imagestreams and ruby-rails-application for Helm charts #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa4b87a
Rename ruby-imagestreams and ruby-rails-application for Helm charts
phracek Feb 11, 2025
fa7b893
Specify which tests will be running on shared_cluster.
phracek Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/test_helm_ruby_imagestreams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
class TestHelmRHELRubyImageStreams:

def setup_method(self):
package_name = "ruby-imagestreams"
package_name = "redhat-ruby-imagestreams"
path = test_dir
self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, remote=True)
self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, shared_cluster=True)
self.hc_api.clone_helm_chart_repo(
repo_url="https://github.com/sclorg/helm-charts", repo_name="helm-charts",
subdir="charts/redhat"
Expand Down
14 changes: 7 additions & 7 deletions test/test_helm_ruby_rails_application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
TAG = TAGS.get(OS, None)


class TestHelmCakePHPTemplate:
class TestHelmRubyTemplate:

def setup_method(self):
package_name = "ruby-rails-application"
package_name = "redhat-ruby-rails-application"
path = test_dir
self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, remote=True)
self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, shared_cluster=True)
self.hc_api.clone_helm_chart_repo(
repo_url="https://github.com/sclorg/helm-charts", repo_name="helm-charts",
subdir="charts/redhat"
Expand All @@ -48,10 +48,10 @@ def test_curl_connection(self):
rails_ex_branch = "master"
if VERSION == "3.3":
rails_ex_branch = VERSION
self.hc_api.package_name = "ruby-imagestreams"
self.hc_api.package_name = "redhat-ruby-imagestreams"
assert self.hc_api.helm_package()
assert self.hc_api.helm_installation()
self.hc_api.package_name = "ruby-rails-application"
self.hc_api.package_name = "redhat-ruby-rails-application"
assert self.hc_api.helm_package()
assert self.hc_api.helm_installation(
values={
Expand All @@ -70,10 +70,10 @@ def test_by_helm_test(self):
rails_ex_branch = "master"
if VERSION == "3.3":
rails_ex_branch = VERSION
self.hc_api.package_name = "ruby-imagestreams"
self.hc_api.package_name = "redhat-ruby-imagestreams"
assert self.hc_api.helm_package()
assert self.hc_api.helm_installation()
self.hc_api.package_name = "ruby-rails-application"
self.hc_api.package_name = "redhat-ruby-rails-application"
assert self.hc_api.helm_package()
assert self.hc_api.helm_installation(
values={
Expand Down
2 changes: 1 addition & 1 deletion test/test_ruby_ex_standalone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
class TestS2IRailsExTemplate:

def setup_method(self):
self.oc_api = OpenShiftAPI(pod_name_prefix="ruby-testing", version=VERSION)
self.oc_api = OpenShiftAPI(pod_name_prefix="ruby-testing", version=VERSION, shared_cluster=True)

def teardown_method(self):
self.oc_api.delete_project()
Expand Down
2 changes: 1 addition & 1 deletion test/test_s2i_imagestreams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
class TestRubyImagestreams:

def setup_method(self):
self.oc_api = OpenShiftAPI(pod_name_prefix="ruby", version=VERSION)
self.oc_api = OpenShiftAPI(pod_name_prefix="ruby", version=VERSION, shared_cluster=True)

def teardown_method(self):
self.oc_api.delete_project()
Expand Down
2 changes: 1 addition & 1 deletion test/test_s2i_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
class TestS2IRubyTemplate:

def setup_method(self):
self.oc_api = OpenShiftAPI(pod_name_prefix="ruby-testing", version=VERSION)
self.oc_api = OpenShiftAPI(pod_name_prefix="ruby-testing", version=VERSION, shared_cluster=True)

def teardown_method(self):
self.oc_api.delete_project()
Expand Down