Skip to content

Commit

Permalink
Merge pull request #33 from sclorg/add_tests
Browse files Browse the repository at this point in the history
Add nginx-ex tests executed on OpenShift 4
  • Loading branch information
phracek authored Mar 20, 2024
2 parents fc389c5 + f0aee90 commit ac38f6f
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/openshift-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [ "1.20-ubi7", "1.20-ubi8", "1.22-ubi8", "1.20-ubi9", "1.22-ubi9" ]
version: [ "1.20-ubi7", "1.22-ubi8", "1.20-ubi9", "1.22-ubi9" ]

if: |
github.event.issue.pull_request
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.PHONY: test-openshift-4
test-openshift-4:
cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --verbose --color=yes --showlocals .
50 changes: 50 additions & 0 deletions tests/test_nginx.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import os

import pytest
from pathlib import Path

from container_ci_suite.openshift import OpenShiftAPI

test_dir = Path(os.path.abspath(os.path.dirname(__file__)))

VERSION=os.getenv("SINGLE_VERSION")
if not VERSION:
VERSION="1.22-ubi8"

class TestNginxExTemplate:

def setup_method(self):
self.oc_api = OpenShiftAPI(pod_name_prefix="nginx-example")
json_raw_file = self.oc_api.get_raw_url_for_json(
container="nginx-container", dir="imagestreams", filename="nginx-rhel.json"
)
self.oc_api.import_is(path=json_raw_file, name="nginx")

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

def test_template_inside_cluster(self):
template_json = self.oc_api.get_raw_url_for_json(
container="nginx-ex", dir="openshift/templates", filename="nginx.json"
)
assert self.oc_api.deploy_template(
template=template_json, name_in_template="nginx-example", expected_output="Welcome to your static nginx application",
openshift_args=["SOURCE_REPOSITORY_REF=master", f"NGINX_VERSION={VERSION}", "NAME=nginx-example"]
)
assert self.oc_api.template_deployed(name_in_template="nginx-example")
assert self.oc_api.check_response_inside_cluster(
name_in_template="nginx-example", expected_output="Welcome to your static nginx application"
)

def test_template_by_request(self):
template_json = self.oc_api.get_raw_url_for_json(
container="nginx-ex", dir="openshift/templates", filename="nginx.json"
)
assert self.oc_api.deploy_template(
template=template_json, name_in_template="nginx-example", expected_output="Welcome to your static nginx application",
openshift_args=["SOURCE_REPOSITORY_REF=master", f"NGINX_VERSION={VERSION}", "NAME=nginx-example"]
)
assert self.oc_api.template_deployed(name_in_template="nginx-example")
assert self.oc_api.check_response_outside_cluster(
name_in_template="nginx-example", expected_output="Welcome to your static nginx application"
)

0 comments on commit ac38f6f

Please sign in to comment.