Skip to content

Commit

Permalink
Update bibop tests
Browse files Browse the repository at this point in the history
  • Loading branch information
andyone committed May 3, 2024
1 parent 7f993a3 commit 2edf5a2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 91 deletions.
88 changes: 0 additions & 88 deletions .bibop/webkaos-docker.recipe
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,6 @@ command "-" "Check if docker is installed"

## Prefetch images ##

command:fetch "docker pull {image_name}:centos7" "Pull CentOS 7 Image"
exit 0

+command:fetch "docker pull {image_name}:centos7-unprivileged" "Pull CentOS 7 Unprivileged Image"
exit 0

+command:fetch "docker pull {image_name}:ol7" "Pull OracleLinux 7 Image"
exit 0

+command:fetch "docker pull {image_name}:ol7-unprivileged" "Pull OracleLinux 7 Unprivileged Image"
exit 0

+command:fetch "docker pull {image_name}:ol8" "Pull OracleLinux 8 Image"
exit 0

Expand All @@ -41,18 +29,6 @@ command:fetch "docker pull {image_name}:centos7" "Pull CentOS 7 Image"

## Build images ##

command "docker build --build-arg {repo_tag} -f ../.docker/centos7.docker -t {image_name}:centos7 .." "Build CentOS 7 Image"
exit 0 {build_timeout}

+command "docker build --build-arg {repo_tag} -f ../.docker/centos7-unprivileged.docker -t {image_name}:centos7-unprivileged .." "Build CentOS 7 Unprivileged Image"
exit 0 {build_timeout}

+command "docker build --build-arg {repo_tag} -f ../.docker/ol7.docker -t {image_name}:ol7 .." "Build OracleLinux 7 Image"
exit 0 {build_timeout}

+command "docker build --build-arg {repo_tag} -f ../.docker/ol7-unprivileged.docker -t {image_name}:ol7-unprivileged .." "Build OracleLinux 7 Unprivileged Image"
exit 0 {build_timeout}

+command "docker build --build-arg {repo_tag} -f ../.docker/ol8.docker -t {image_name}:ol8 .." "Build OracleLinux 8 Image"
exit 0 {build_timeout}

Expand All @@ -65,70 +41,6 @@ command "docker build --build-arg {repo_tag} -f ../.docker/centos7.docker -t {im
+command "docker build --build-arg {repo_tag} -f ../.docker/ol9-unprivileged.docker -t {image_name}:ol9-unprivileged .." "Build OracleLinux 9 Unprivileged Image"
exit 0 {build_timeout}

## CentOS 7 ##

command "docker run --name webkaos -p {test_port}:80 -d {image_name}:centos7" "Start container"
exit 0

+command "-" "Check if server is accessible"
wait {start_delay}
http-status GET "http://0.0.0.0:{test_port}" 200
http-header GET "http://0.0.0.0:{test_port}" server webkaos

+command "docker kill webkaos" "Kill container after test"
exit 0

+command "docker rm webkaos" "Remove named container after test"
exit 0

## CentOS 7 Unprivileged ##

command "docker run --name webkaos -p {test_port}:8080 -d {image_name}:centos7-unprivileged" "Start container"
exit 0

+command "-" "Check if server is accessible"
wait {start_delay}
http-status GET "http://0.0.0.0:{test_port}" 200
http-header GET "http://0.0.0.0:{test_port}" server webkaos

+command "docker kill webkaos" "Kill container after test"
exit 0

+command "docker rm webkaos" "Remove named container after test"
exit 0

## Oracle Linux 7 ##

command "docker run --name webkaos -p {test_port}:80 -d {image_name}:ol7" "Start container"
exit 0

+command "-" "Check if server is accessible"
wait {start_delay}
http-status GET "http://0.0.0.0:{test_port}" 200
http-header GET "http://0.0.0.0:{test_port}" server webkaos

+command "docker kill webkaos" "Kill container after test"
exit 0

+command "docker rm webkaos" "Remove named container after test"
exit 0

## Oracle Linux 7 Unprivileged ##

command "docker run --name webkaos -p {test_port}:8080 -d {image_name}:ol7-unprivileged" "Start container"
exit 0

+command "-" "Check if server is accessible"
wait {start_delay}
http-status GET "http://0.0.0.0:{test_port}" 200
http-header GET "http://0.0.0.0:{test_port}" server webkaos

+command "docker kill webkaos" "Kill container after test"
exit 0

+command "docker rm webkaos" "Remove named container after test"
exit 0

## Oracle Linux 8 ##

command "docker run --name webkaos -p {test_port}:80 -d {image_name}:ol8" "Start container"
Expand Down
6 changes: 3 additions & 3 deletions .bibop/webkaos.recipe
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Bibop recipe for webkaos (EL7/EL8/EL9)
# Bibop recipe for webkaos (EL8/EL9)
# See more: https://kaos.sh/bibop

pkg webkaos webkaos-debug webkaos-nginx webkaos-module-brotli webkaos-module-naxsi
pkg webkaos webkaos-debug webkaos-nginx webkaos-module-brotli

require-root yes
unsafe-actions yes
Expand All @@ -20,7 +20,7 @@ var ssl_dir {prefix_dir}/ssl
var dh_param {ssl_dir}/dhparam.pem
var log_dir /var/log/webkaos

var lua_ver 2.1.0-beta3
var lua_ver 2.1
var lua_dir /usr/share/webkaos/luajit/share/luajit-{lua_ver}

command "-" "System environment validation"
Expand Down

0 comments on commit 2edf5a2

Please sign in to comment.