summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rw-r--r--ci/PR_revision.log1
-rwxr-xr-xci/run_smoke_tests.sh5
-rwxr-xr-xci/util.sh34
3 files changed, 33 insertions, 7 deletions
diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index de62cb6b..bbf39d02 100644
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -12,3 +12,4 @@
33,Removes QOS service plugin from Neutron
35,Use nic1 as control plane inteface name instead of default br-ex
38,Fixes nova default floating pool to be 'external'
+39,removing extra whitespace from congress parameter
diff --git a/ci/run_smoke_tests.sh b/ci/run_smoke_tests.sh
new file mode 100755
index 00000000..b0599527
--- /dev/null
+++ b/ci/run_smoke_tests.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+source ../lib/utility-functions.sh
+
+ansible-playbook -i "$(get_undercloud_ip)," ../tests/smoke_tests/smoke_tests.yml
diff --git a/ci/util.sh b/ci/util.sh
index f55e1e0f..ad7f0788 100755
--- a/ci/util.sh
+++ b/ci/util.sh
@@ -21,13 +21,19 @@ resolve_cmd() {
}
display_usage() {
- echo -e "Usage:\n$0 [arguments] \n"
- echo -e " undercloud <user> <command> : Connect to Undercloud VM as <user> and execute command <command>\n"
- echo -e " <user> Optional: Defaults to 'stack', <command> Optional: Defaults to none\n"
- echo -e " overcloud <node> <command> : Connect to an Overcloud <node> and execute command <command>\n"
- echo -e " <node> Required in format controller|compute<number>. Example: controller0\n"
- echo -e " <command> Optional: Defaults to none\n"
- echo -e " debug-stack : Print parsed deployment failures to stdout \n"
+ echo -e "Usage:\n$0 subcommand [ arguments ]\n"
+ echo -e "Arguments:\n"
+ echo -e " undercloud [ user [ command ] ] Connect to Undercloud VM as user and optionally execute a command\n"
+ echo -e " user Optional: Defaults to 'stack'\n"
+ echo -e " command Optional: Defaults to none\n"
+ echo -e ""
+ echo -e " overcloud [ node [ command ] ] Connect to an Overcloud node and optionally execute a command\n"
+ echo -e " node Required: in format controller|compute<number>. Example: controller0\n"
+ echo -e " command Optional: Defaults to none\n"
+ echo -e ""
+ echo -e " debug-stack Print parsed deployment failures to stdout \n"
+ echo -e ""
+ echo -e " mock-detached on | off Add firewall rules to the jump host to mock a detached deployment \n"
}
##translates the command line argument
@@ -77,6 +83,20 @@ parse_cmdline() {
undercloud_connect stack "$(typeset -f debug_stack); debug_stack"
exit 0
;;
+ mock-detached)
+ if [ "$2" == "on" ]; then
+ echo "Blocking output http and https traffic"
+ iptables -A OUTPUT -p tcp --dport 80 -j REJECT
+ iptables -A OUTPUT -p tcp --dport 443 -j REJECT
+ elif [ "$2" == "off" ]; then
+ echo "Allowing output http and https traffic"
+ iptables -D OUTPUT -p tcp --dport 80 -j REJECT
+ iptables -D OUTPUT -p tcp --dport 443 -j REJECT
+ else
+ display_usage
+ fi
+ exit 0
+ ;;
*)
echo -e "\n\nThis script is used to interact with Apex deployments\n\n"
echo "Use -h to display help"