From 0317805c30a956f12631b27e43de611e85bdc49e Mon Sep 17 00:00:00 2001 From: Barry McCormick Date: Thu, 12 Oct 2023 20:23:47 -0700 Subject: [PATCH] Testnginx (#10) * nginx test 1 * nginx test 2 * nginx test 3 * nginx test 4 * nginx test 5 * nginx test 6 * nginx test 7 * nginx test 8 * nginx test 9 * nginx test 10 * nginx test 11 * nginx test 12 * nginx test 13 * nginx test 14 * nginx test 15 * nginx test 16 * nginx test 17 * nginx test 18 * nginx test 19 * nginx test 20 * nginx test 21 * nginx test 22 * nginx test 23 * nginx test 24 * nginx test 25 * nginx test 26 * nginx test 27 * nginx test 28 * rdr fixes * start of haproxy test 1 * test 29 * test 30 * test 31 * nginx status * added service check * added service check 2 * added service check 3 * added service check 4 * added service check 5 * completed nginx check --------- Co-authored-by: Barry McCormick --- .cirrus.yml | 21 ++++++++++++--------- changed.txt | 1 - changed2.txt | 0 diff.txt | 1 - test.sh | 23 ----------------------- www/nginx/.cirrus.yml | 22 ---------------------- www/nginx/test.sh | 35 ++++++++++++++++++++++++++--------- www/nginx/test1.txt2 | 0 8 files changed, 38 insertions(+), 65 deletions(-) delete mode 100644 changed.txt delete mode 100644 changed2.txt delete mode 100644 diff.txt delete mode 100755 test.sh delete mode 100644 www/nginx/.cirrus.yml delete mode 100644 www/nginx/test1.txt2 diff --git a/.cirrus.yml b/.cirrus.yml index 1635685..7e90a32 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,32 +10,35 @@ task: show_build_trigger: echo $BRANCH script: - echo "branch is $BRANCH" - - pkg install -y git + - pkg install -y git curl + - echo 'pf_enable="YES"' >> /etc/rc.conf - git clone https://github.com/BastilleBSD/bastille.git - cd bastille - make install - cd /usr/local/etc/bastille - cp bastille.conf.sample bastille.conf - bastille setup - - bastille bootstrap 13.2-RELEASE - - bastille create testrun 13.2-RELEASE 10.0.0.1 - - bastille list + - service pf start + - service pf status - git clone https://github.com/BastilleBSD/templates.git + - bastille bootstrap 13.2-RELEASE + - bastille create testrun 13.2-RELEASE 10.17.89.66 + - bastille list - cd templates - echo " branch is $BRANCH " - git checkout $BRANCH - - git diff --dirstat origin/cicd..cicd ./* - - git diff --dirstat main..$BRANCH ./* >> diff.txt + - git branch + - echo "GHSHA is $GHSHA" + - git diff --dirstat $BRANCH..main ./* + - git diff --dirstat $BRANCH..main ./* > diff.txt - echo "*** diff.txt ***" - cat diff.txt - # Use sed to remove characters before the match pattern - - match_pattern=" " - - sed "s/*$match_pattern/$match_pattern/" "diff.txt" >> changed.txt + - sed 's/.* //' diff.txt > changed.txt - echo "*** changed.txt ***" - cat changed.txt - read -r CHDIR <"changed.txt" - echo $CHDIR - - bastille template testrun $CHDIR - cd $CHDIR - pwd - chmod +x ./test.sh diff --git a/changed.txt b/changed.txt deleted file mode 100644 index 1c509b1..0000000 --- a/changed.txt +++ /dev/null @@ -1 +0,0 @@ - misc/temp/ diff --git a/changed2.txt b/changed2.txt deleted file mode 100644 index e69de29..0000000 diff --git a/diff.txt b/diff.txt deleted file mode 100644 index 0601fc9..0000000 --- a/diff.txt +++ /dev/null @@ -1 +0,0 @@ - 100.0% misc/temp/ diff --git a/test.sh b/test.sh deleted file mode 100755 index 0b55c86..0000000 --- a/test.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/bash -git rev-parse --abbrev-ref HEAD > branch.txt -read -r BRANCH <"branch.txt" -echo $BRANCH -rm branch.txt - -git diff --dirstat main $BRANCH ./* > diff.txt -echo "*** diff.txt ***" -cat diff.txt - -# Use sed to remove characters before the match pattern -match_pattern=' ' -sed "s/.*$match_pattern/$match_pattern/" "diff.txt" > changed.txt - -echo "*** changed.txt ***" -cat changed.txt - -read -r CHDIR <"changed.txt" -echo $CHDIR - -cd $CHDIR -pwd - diff --git a/www/nginx/.cirrus.yml b/www/nginx/.cirrus.yml deleted file mode 100644 index e316e4e..0000000 --- a/www/nginx/.cirrus.yml +++ /dev/null @@ -1,22 +0,0 @@ -# .cirrus.yml: -compute_engine_instance: - # Image list available via - # gcloud compute images list --project freebsd-org-cloud-dev --no-standard-images - platform: freebsd - image_project: freebsd-org-cloud-dev - image: freebsd-13-2-release-amd64 - cpu: 1 - memory: 2G - disk: 10 - - - - -task: - webserver_tests: - description: Test the web server - freebsd: - - pkg install -y curl wget # Install required tools (for FreeBSD) - script: - - curl -Is http://localhost:8080/ | grep "HTTP/1.1 200 OK" # Example test with curl - - wget --spider http://localhost:8080/ # Example test with wget diff --git a/www/nginx/test.sh b/www/nginx/test.sh index 94566db..e87a050 100644 --- a/www/nginx/test.sh +++ b/www/nginx/test.sh @@ -1,11 +1,28 @@ -#!/bin/sh - +echo "starting test script" +cd ../../ +pwd +bastille template testrun www/nginx +echo "template applied" +bastille cmd testrun service nginx status +bastille rdr testrun tcp 80 80 +bastille rdr testrun list +ifconfig response=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:80) +echo "tested response" +echo "response is:" $response + +service_name="nginx" +jail_name="testrun" + +service_status=$(jexec testrun service $service_name status) + +# Check the service status and provide appropriate output +if echo "$service_status" | grep -q "is running"; then + echo "$service_name is running in jail $jail_name." +else + echo "$service_name is not running in jail $jail_name." + exit 1 +fi + + - # Check if the response code is 200 (OK) - - if [ "$response" -eq 200 ]; then - echo "Web server is responding with HTTP 200 OK."; - else - echo "Web server is not responding with HTTP 200 OK. Response code: $response"; - exit 1; # Exit with an error status - fi diff --git a/www/nginx/test1.txt2 b/www/nginx/test1.txt2 deleted file mode 100644 index e69de29..0000000