Distro Test - Ubuntu 18.04.2 LTS

Fix nginx.conf location / add commit during build process to capture changes made in this script / This tests install-ngxblocker and setup-ngxblocker on Nginx for Ubuntu 18.04.2 LTS using default nginx.conf and modified nginx.conf REF: #256 REF: #266
This commit is contained in:
Mitchell Krog 2019-07-01 16:53:30 +02:00
parent f2aacdb217
commit 694172b8d1
No known key found for this signature in database
GPG key ID: C243C388553EDE5D

View file

@ -93,13 +93,13 @@ echo "${bold}${magenta}Execute setup-ngxblocker - Ubuntu 18.04.2 LTS"
echo "${bold}${magenta}---------------------------------------------" echo "${bold}${magenta}---------------------------------------------"
printf "\n" printf "\n"
cd /usr/sbin cd /usr/sbin
sudo bash ./setup-ngxblocker -x -c ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/conf.d -b ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/bots.d sudo bash ./setup-ngxblocker -x -c ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/conf.d -b ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/bots.d -m ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/nginx.conf
} }
installngxblocker_ubuntu_1804_NI () { installngxblocker_ubuntu_1804_NI () {
echo "${bold}${magenta}-----------------------------------------------" echo "${bold}${magenta}------------------------------------------------------------------"
echo "${bold}${magenta}Execute install-ngxblocker - Ubuntu 18.04.2 LTS" echo "${bold}${magenta}Execute install-ngxblocker - Ubuntu 18.04.2 LTS (Missing includes)"
echo "${bold}${magenta}-----------------------------------------------" echo "${bold}${magenta}------------------------------------------------------------------"
printf "\n" printf "\n"
cd /usr/sbin cd /usr/sbin
# Reset Test # Reset Test
@ -109,12 +109,12 @@ sudo bash ./install-ngxblocker -x -c ${TRAVIS_BUILD_DIR}/.dev-tools/distribution
setupngxblocker_ubuntu_1804_NI () { setupngxblocker_ubuntu_1804_NI () {
printf "\n" printf "\n"
echo "${bold}${magenta}---------------------------------------------" echo "${bold}${magenta}----------------------------------------------------------------"
echo "${bold}${magenta}Execute setup-ngxblocker - Ubuntu 18.04.2 LTS" echo "${bold}${magenta}Execute setup-ngxblocker - Ubuntu 18.04.2 LTS (Missing includes)"
echo "${bold}${magenta}---------------------------------------------" echo "${bold}${magenta}----------------------------------------------------------------"
printf "\n" printf "\n"
cd /usr/sbin cd /usr/sbin
sudo bash ./setup-ngxblocker -x -c ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/conf.d -b ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/bots.d sudo bash ./setup-ngxblocker -x -c ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/conf.d -b ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/bots.d -m ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/nginx.conf
} }
backupConfFiles () { backupConfFiles () {
@ -125,6 +125,9 @@ echo "${bold}${green}-------------------------------------------------------"
printf "\n" printf "\n"
} }
commitchanges () {
git add -A
}
# ----------------- # -----------------
# Trigger Functions # Trigger Functions
@ -135,6 +138,10 @@ setupngxblocker_ubuntu_1804
installngxblocker_ubuntu_1804_NI installngxblocker_ubuntu_1804_NI
setupngxblocker_ubuntu_1804_NI setupngxblocker_ubuntu_1804_NI
# Catch incremental changes during build process
commitchanges
# ---------------------- # ----------------------
# Exit With Error Number # Exit With Error Number
# ---------------------- # ----------------------