Skip to content

Commit

Permalink
Merge pull request #69 from sclorg/new_940_images
Browse files Browse the repository at this point in the history
Add new RHEL-9.4. images
  • Loading branch information
phracek authored May 16, 2024
2 parents dd440b2 + 68cc5c1 commit 55fd0b4
Show file tree
Hide file tree
Showing 11 changed files with 116 additions and 0 deletions.
10 changes: 10 additions & 0 deletions deploy-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,34 +85,44 @@
- rhel8-django-ex-python-36
- rhel8-django-ex-python-38
- rhel8-mariadb-105-container
- rhel8-mariadb-1011-container
- rhel8-s2i-perl-532-container
- rhel8-s2i-perl-526-container
- rhel8-s2i-python-36-container
- rhel8-s2i-python-39-container
- rhel8-s2i-python-311-container
- rhel8-s2i-python-312-container
- rhel8-postgresql-10-container
- rhel8-postgresql-12-container
- rhel8-postgresql-13-container
- rhel8-postgresql-15-container
- rhel8-postgresql-16-container
- rhel8-s2i-ruby-25-container
- rhel8-s2i-ruby-31-container
- rhel8-s2i-ruby-33-container
- rhel8-mysql-80-container
- rhel8-nginx-ex-122
- rhel8-nginx-ex-124
- rhel9-httpd-ex
- rhel9-mariadb-105-container
- rhel9-mariadb-1011-container
- rhel9-mysql-80-container
- rhel9-nginx-ex-122
- rhel9-nginx-ex-124
- rhel9-nodejs-ex-18
- rhel9-nodejs-ex-18-minimal
- rhel9-nodejs-ex-20
- rhel9-nodejs-ex-20-minimal
- rhel9-postgresql-13-container
- rhel9-postgresql-15-container
- rhel9-postgresql-16-container
- rhel9-s2i-perl-532-container
- rhel9-s2i-python-39-container
- rhel9-s2i-python-311-container
- rhel9-s2i-python-312-container
- rhel9-s2i-ruby-30-container
- rhel9-s2i-ruby-31-container
- rhel9-s2i-ruby-33-container
when: (github_repo == "") and (ext_test == "")

- name: Check None-s2i containers
Expand Down
16 changes: 16 additions & 0 deletions vars/rhel8-mariadb-1011-container.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
registry_redhat_io: "rhel8/mariadb-1011"
tag_name: "mariadb:10.11-el8"
deployment: "oc new-app mariadb:10.11-el8~https://github.com/sclorg/mariadb-container.git \
--name rhel8-mariadb-1011 \
--context-dir=examples/extend-image \
--env MYSQL_OPERATIONS_USER=opuser \
--env MYSQL_OPERATIONS_PASSWORD=oppass \
--env MYSQL_DATABASE=opdb \
--env MYSQL_USER=user \
--env MYSQL_PASSWORD=pass"
pod_name: "rhel8-mariadb-1011"
add_route: true
test_exec_command: "./files/check_mariadb_container.sh"
expected_exec_result: "FINE"
scl_url: "mariadb-container"
is_name: "mariadb"
7 changes: 7 additions & 0 deletions vars/rhel8-nginx-ex-124.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
registry_redhat_io: "ubi8/nginx-124"
tag_name: "nginx:1.24-ubi8"
deployment: "oc process -f https://raw.githubusercontent.com/sclorg/nginx-ex/master/openshift/templates/nginx.json -p NGINX_VERSION=1.24-ubi8 -p NAMESPACE={{ oc_project_rhscl }} | oc apply -f -"
pod_name: "nginx-example"
check_curl_output: "Welcome to your static nginx application"
scl_url: "nginx-container"
is_name: "nginx"
14 changes: 14 additions & 0 deletions vars/rhel8-postgresql-16-container.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
registry_redhat_io: "rhel8/postgresql-16"
tag_name: "postgresql:16-el8"
deployment: "oc new-app postgresql:16-el8~https://github.com/sclorg/postgresql-container.git \
--name rhel8-postgresql-16 \
--context-dir examples/extending-image/ \
-e POSTGRESQL_USER=user \
-e POSTGRESQL_DATABASE=db \
-e POSTGRESQL_PASSWORD=password"
pod_name: "rhel8-postgresql-16"
add_route: true
test_exec_command: "./files/check_postgresql_container.sh"
expected_exec_result: "FINE"
scl_url: "postgresql-container"
is_name: "postgresql"
8 changes: 8 additions & 0 deletions vars/rhel8-s2i-python-312-container.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
registry_redhat_io: "rhel8/python-312"
tag_name: "python:3.12-el8"
deployment: "oc new-app python:3.12-el9~https://github.com/sclorg/s2i-python-container.git --context-dir=3.12/test/setup-test-app/"
pod_name: "s2i-python-container"
add_route: true
check_curl_output: "Hello from gunicorn WSGI application"
scl_url: "s2i-python-container"
is_name: "python"
8 changes: 8 additions & 0 deletions vars/rhel8-s2i-ruby-33-container.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
registry_redhat_io: "ubi8/ruby-33"
tag_name: "ruby:3.3-ubi8"
deployment: "oc new-app ruby:3.3-ubi8~https://github.com/sclorg/s2i-ruby-container.git --context-dir=3.3/test/puma-test-app/"
pod_name: "s2i-ruby-container"
add_route: true
check_curl_output: "Hello world"
scl_url: "s2i-ruby-container"
is_name: "ruby"
16 changes: 16 additions & 0 deletions vars/rhel9-mariadb-1011-container.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
registry_redhat_io: "rhel9/mariadb-1011"
tag_name: "mariadb:10.11-el9"
deployment: "oc new-app mariadb:10.11-el9~https://github.com/sclorg/mariadb-container.git \
--name rhel9-mariadb-1011 \
--context-dir=examples/extend-image \
--env MYSQL_OPERATIONS_USER=opuser \
--env MYSQL_OPERATIONS_PASSWORD=oppass \
--env MYSQL_DATABASE=opdb \
--env MYSQL_USER=user \
--env MYSQL_PASSWORD=pass"
pod_name: "rhel9-mariadb-1011"
add_route: true
test_exec_command: "./files/check_mariadb_container.sh"
expected_exec_result: "FINE"
scl_url: "mariadb-container"
is_name: "mariadb"
7 changes: 7 additions & 0 deletions vars/rhel9-nginx-ex-124.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
registry_redhat_io: "ubi9/nginx-124"
tag_name: "nginx:1.24-ubi9"
deployment: "oc process -f https://raw.githubusercontent.com/sclorg/nginx-ex/master/openshift/templates/nginx.json -p NGINX_VERSION=1.24-ubi9 -p NAMESPACE={{ oc_project_rhscl }} | oc apply -f -"
pod_name: "nginx-example"
check_curl_output: "Welcome to your static nginx application"
scl_url: "nginx-container"
is_name: "nginx"
14 changes: 14 additions & 0 deletions vars/rhel9-postgresql-16-container.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
registry_redhat_io: "rhel9/postgresql-16"
tag_name: "postgresql:16-el9"
deployment: "oc new-app postgresql:16-el9~https://github.com/sclorg/postgresql-container.git \
--name rhel9-postgresql-16 \
--context-dir examples/extending-image/ \
-e POSTGRESQL_USER=user \
-e POSTGRESQL_DATABASE=db \
-e POSTGRESQL_PASSWORD=password"
pod_name: "rhel9-postgresql-16"
add_route: true
test_exec_command: "./files/check_postgresql_container.sh"
expected_exec_result: "FINE"
scl_url: "postgresql-container"
is_name: "postgresql"
8 changes: 8 additions & 0 deletions vars/rhel9-s2i-python-312-container.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
registry_redhat_io: "rhel9/python-312"
tag_name: "python:3.12-el9"
deployment: "oc new-app python:3.12-el9~https://github.com/sclorg/s2i-python-container.git --context-dir=3.12/test/setup-test-app/"
pod_name: "s2i-python-container"
add_route: true
check_curl_output: "Hello from gunicorn WSGI application"
scl_url: "s2i-python-container"
is_name: "python"
8 changes: 8 additions & 0 deletions vars/rhel9-s2i-ruby-33-container.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
registry_redhat_io: "ubi9/ruby-33"
tag_name: "ruby:3.3-ubi9"
deployment: "oc new-app ruby:3.3-ubi9~https://github.com/sclorg/s2i-ruby-container.git --context-dir=3.3/test/puma-test-app/"
pod_name: "s2i-ruby-container"
add_route: true
check_curl_output: "Hello world"
scl_url: "s2i-ruby-container"
is_name: "ruby"

0 comments on commit 55fd0b4

Please sign in to comment.