add ansible tests, use common docker image

gschueler · gschueler · commit afafdca47e0e · 2017-08-08T16:57:27.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ before_install:
   - sudo apt-get install -y xmlstarlet jq
   - sudo chsh --shell $(which bash)
 script:
-    - './gradlew clean build && groovy testbuild.groovy -gradle && make TAG=SNAPSHOT BUILD_NUM=$TRAVIS_BUILD_NUMBER rpm deb && bash run-api-tests.sh && bash run-docker-tests.sh && bash run-docker-ssl-tests.sh && DOCKER_COMPOSE_SPEC=docker-compose-api-mysql.yaml bash run-docker-api-tests.sh'
+    - './gradlew clean build && groovy testbuild.groovy -gradle && make TAG=SNAPSHOT BUILD_NUM=$TRAVIS_BUILD_NUMBER rpm deb && bash run-api-tests.sh && DOCKER_COMPOSE_SPEC=docker-compose-api-mysql.yaml bash run-docker-api-tests.sh && bash run-docker-tests.sh && bash run-docker-ssl-tests.sh && bash run-docker-ansible-tests.sh'
 addons:
   hostname: rdbuild
   apt:
diff --git a/run-docker-ansible-tests.sh b/run-docker-ansible-tests.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+#/ trigger local ci test run
+
+
+. rd_versions.sh
+
+
+set -euo pipefail
+IFS=$'\n\t'
+readonly ARGS=("$@")
+DOCKER_DIR=$PWD/test/docker
+
+usage() {
+      grep '^#/' <"$0" | cut -c4- # prints the #/ lines above as usage info
+}
+die(){
+    echo >&2 "$@" ; exit 2
+}
+
+check_args(){
+	if [ ${#ARGS[@]} -gt 0 ] ; then
+    	DOCKER_DIR=$1
+	fi
+}
+copy_jar(){
+	local FARGS=("$@")
+	local DIR=${FARGS[0]}
+	local -a VERS=( $( rd_get_version ) )
+	local JAR=rundeck-launcher-${VERS[0]}-${VERS[2]}.jar
+	local buildJar=$PWD/rundeck-launcher/launcher/build/libs/$JAR
+	test -f $buildJar || die "Jar file not found $buildJar"
+	mkdir -p $DIR
+	cp $buildJar $DIR/rundeck-launcher.jar
+	echo $DIR/$JAR
+}
+run_tests(){
+	local FARGS=("$@")
+	local DIR=${FARGS[0]}
+
+	cd $DIR
+	bash $DIR/test-ansible.sh
+}
+run_docker_test(){
+	local FARGS=("$@")
+	local DIR=${FARGS[0]}
+	local launcherJar=$( copy_jar $DIR ) || die "Failed to copy jar"
+	run_tests $DIR
+}
+
+
+main() {
+    check_args
+    run_docker_test  $DOCKER_DIR
+}
+main
+
diff --git a/test/docker/common.sh b/test/docker/common.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export RUNDECK_VERSION=${RUNDECK_VERSION:-2.7.0}
+export RUNDECK_VERSION=${RUNDECK_VERSION:-2.9.2}
 export LAUNCHER_URL=${LAUNCHER_URL:-http://dl.bintray.com/rundeck/rundeck-maven/rundeck-launcher-${RUNDECK_VERSION}.jar}
 export CLI_DEB_URL=${CLI_DEB_URL:-https://dl.bintray.com/rundeck/rundeck-deb}
-export CLI_VERS=${CLI_VERS:-1.0.0-1}
+export CLI_VERS=${CLI_VERS:-1.0.15-1}
diff --git a/test/docker/docker-compose-ansible-test.yaml b/test/docker/docker-compose-ansible-test.yaml
@@ -1,14 +1,10 @@
-version: '3'
+version: '2'
 
 services:
   rundeck1:
     hostname: rundeck1
     build:
       context: dockers/rundeckansible/
-      args:
-        CLI_DEB_URL: ${CLI_DEB_URL}
-        CLI_VERS: ${CLI_VERS}
-        LAUNCHER_URL: ${LAUNCHER_URL}
     links:
       - hostnode
     environment:
@@ -22,6 +18,7 @@ services:
       - CONFIG_SCRIPT_PRESTART=scripts/config-ansible.sh
       - SETUP_TEST_PROJECT=atest
       - CONFIG_TEST_PROJECT_FILE=atest/atest-project.properties
+      - NODE_CACHE_FIRST_LOAD_SYNCH=1
     volumes:
       - logs:/home/rundeck/logs:rw
       - resources:/home/rundeck/resources:rw
diff --git a/test/docker/docker-compose-api-mysql.yaml b/test/docker/docker-compose-api-mysql.yaml
@@ -17,12 +17,7 @@ services:
        - ./dockers/mysql/conf:/etc/mysql/conf.d
   rundeck1:
     hostname: rundeck1
-    build:
-      context: dockers/rundeck/
-      args:
-        CLI_DEB_URL: ${CLI_DEB_URL}
-        CLI_VERS: ${CLI_VERS}
-        LAUNCHER_URL: ${LAUNCHER_URL}
+    image: rdtest:latest
 #    entrypoint: bash /home/rundeck/run.sh
     links:
       - mysql
diff --git a/test/docker/docker-compose-api-test.yml b/test/docker/docker-compose-api-test.yml
@@ -3,12 +3,7 @@ version: '2'
 services:
   rundeck1:
     hostname: rundeck1
-    build:
-      context: dockers/rundeck/
-      args:
-        CLI_DEB_URL: ${CLI_DEB_URL}
-        CLI_VERS: ${CLI_VERS}
-        LAUNCHER_URL: ${LAUNCHER_URL}
+    image: rdtest:latest
 #    entrypoint: bash /home/rundeck/run.sh
     environment:
       - RUNDECK_NODE=rundeck1
diff --git a/test/docker/docker-compose-multinode-test.yml b/test/docker/docker-compose-multinode-test.yml
@@ -3,12 +3,7 @@ version: '2'
 services:
   rundeck1:
     hostname: rundeck1
-    build:
-      context: dockers/rundeck/
-      args:
-        CLI_DEB_URL: ${CLI_DEB_URL}
-        CLI_VERS: ${CLI_VERS}
-        LAUNCHER_URL: ${LAUNCHER_URL}
+    image: rdtest:latest
     links:
       - hostnode
 #    entrypoint: bash /home/rundeck/run.sh
diff --git a/test/docker/docker-compose-ssl-test.yml b/test/docker/docker-compose-ssl-test.yml
@@ -3,12 +3,7 @@ version: '2'
 services:
   rundeck1:
     hostname: rundeck1
-    build:
-      context: dockers/rundeck/
-      args:
-        CLI_DEB_URL: ${CLI_DEB_URL}
-        CLI_VERS: ${CLI_VERS}
-        LAUNCHER_URL: ${LAUNCHER_URL}
+    image: rdtest:latest
 #    entrypoint: bash /home/rundeck/run.sh
     environment:
       - RUNDECK_NODE=rundeck1
diff --git a/test/docker/dockers/rundeck/scripts/config-ansible.sh b/test/docker/dockers/rundeck/scripts/config-ansible.sh
@@ -2,9 +2,8 @@
 #/ does something ...
 #/ usage: [..]
 
-set -euo pipefail
+#set -euo pipefail
 IFS=$'\n\t'
-readonly ARGS=("$@")
 # <http://www.kfirlavi.com/blog/2012/11/14/defensive-bash-programming/>
 # <http://redsymbol.net/articles/unofficial-bash-strict-mode/>
 
@@ -31,10 +30,9 @@ check_args(){
 #  # set -x
 #}
 setup_ansible(){
-	cat >/etc/ansible/hosts <<END
+	sudo cat >/home/rundeck/resources/ansibleinv.ini <<END
 [ansible-nodes]
-$NODE1 ansible_host=$NODE1 ansible_port=22
-test-ansible-node ansible_connection=local ansible_host=127.0.0.1
+test-ansible-node ansible_connection=local
 $RUNDECK_NODE ansible_connection=local
 END
 
diff --git a/test/docker/dockers/rundeck/scripts/run_tests.sh b/test/docker/dockers/rundeck/scripts/run_tests.sh
@@ -4,9 +4,12 @@ set -e
 
 TEST_DIR=$1
 TEST_SCRIPT=${2:-/tests/run-tests.sh}
+TEST_PROJECT=${3:-testproj1}
 
-: ${TEST_DIR?"Argument required"}
-echo "run_tests with $TEST_DIR"
+: ${TEST_DIR?"Dir required"}
+: ${TEST_SCRIPT?"Script required"}
+: ${TEST_PROJECT?"Project required"}
+echo "run_tests with $TEST_DIR and $TEST_SCRIPT for project $TEST_PROJECT"
 
 export API_KEY=letmein99
 # define env vars used by rd tool
@@ -69,11 +72,12 @@ echo "starting tests"
 
 set +e
 chmod -w $TEST_SCRIPT
+chmod +x $TEST_SCRIPT
 sync
 
 $TEST_SCRIPT \
 	--rdeck-base $HOME \
-	--rundeck-project testproj1 \
+	--rundeck-project $TEST_PROJECT \
 	--rundeck-user $USERNAME \
     --test-dir $TEST_DIR
 EC=$?
diff --git a/test/docker/dockers/rundeck/scripts/start_rundeck.sh b/test/docker/dockers/rundeck/scripts/start_rundeck.sh
@@ -241,6 +241,11 @@ if [ -n "$SETUP_SSL" ] ; then
     setup_ssl $RDECK_BASE
 fi
 
+if [ -n "$NODE_CACHE_FIRST_LOAD_SYNCH" ] ; then
+  cat - >>$RDECK_BASE/server/config/rundeck-config.properties <<END
+rundeck.nodeService.nodeCache.firstLoadAsynch=false
+END
+fi
 
 ### PRE CONFIG
 # RUN TEST PRESTART SCRIPT
diff --git a/test/docker/dockers/rundeckansible/Dockerfile b/test/docker/dockers/rundeckansible/Dockerfile
@@ -10,4 +10,8 @@ RUN mkdir -p $HOME/atest
 COPY config $HOME/atest
 VOLUME $HOME/atest
 
+RUN mkdir -p $HOME/ansible-tests
+COPY tests $HOME/ansible-tests
+VOLUME $HOME/ansible-tests
+
 EXPOSE 4440
diff --git a/test/docker/dockers/rundeckansible/config/ansible-jobs.xml b/test/docker/dockers/rundeckansible/config/ansible-jobs.xml
@@ -95,8 +95,8 @@ echo "DATE ----"
 date
 echo "-----"
 
-echo "IFCONFIG ----"
-ifconfig -a
+echo "UNAME ----"
+uname -a
 echo "------"]]></script>
         <scriptargs />
       </command>
diff --git a/test/docker/dockers/rundeckansible/config/atest-project.properties b/test/docker/dockers/rundeckansible/config/atest-project.properties
@@ -1,5 +1,9 @@
 resources.source.2.config.ansible-become=false
 resources.source.2.config.ansible-gather-facts=true
 resources.source.2.config.ansible-ignore-errors=true
-resources.source.2.config.ansible-inventory=/etc/ansible/hosts
-resources.source.2.type=com.batix.rundeck.plugins.AnsibleResourceModelSourceFactory
+resources.source.2.config.ansible-inventory=/home/rundeck/resources/ansibleinv.ini
+resources.source.2.type=com.batix.rundeck.plugins.AnsibleResourceModelSourceFactory
+project.ansible-inventory=/home/rundeck/resources/ansibleinv.ini
+project.ansible-executable=/bin/bash
+service.FileCopier.default.provider=com.batix.rundeck.plugins.AnsibleFileCopier
+service.NodeExecutor.default.provider=com.batix.rundeck.plugins.AnsibleNodeExecutor
diff --git a/test/docker/dockers/rundeckansible/tests/ansible/should-load-ansible-jobs-test.sh b/test/docker/dockers/rundeckansible/tests/ansible/should-load-ansible-jobs-test.sh
@@ -0,0 +1,126 @@
+#!/usr/bin/env roundup
+#
+
+: ${RUNDECK_USER?"environment variable not set."} 
+: ${RUNDECK_PROJECT?"environment variable not set."}
+: ${REMOTE_NODE?"environment variable not set."}
+
+# Let's get started
+# -----------------
+
+# Helpers
+# ------------
+
+#. ./include.sh 
+
+
+# The Plan
+# --------
+describe "load jobs: valid use of ansible plugin"
+JOBID="4fd7f51b-ed22-479e-8785-8393411c0106"
+RUN_MODULE_JOB="$JOBID"
+JOBID2="72d84cce-0eac-49dc-9a16-1515453e3604"
+RUN_PLAYBOOK_JOB="$JOBID2"
+JOBID3="df5fa3e8-5891-456e-a8da-7d3f81f7b644"
+RUN_SCRIPT_JOB="$JOBID3"
+
+it_should_list_ansible_nodes() {
+
+    
+    bash -c "rd nodes list -p $RUNDECK_PROJECT "
+    
+}
+it_should_have_test_ansible_node() {
+
+    # Parse lines into array elements.
+    IFS=$'\n\t'
+    
+   cmdout=($(bash -c "rd nodes list -p $RUNDECK_PROJECT -F test-ansible-node | grep -v '^#' "))
+   expout=( test-ansible-node )
+    echo "${cmdout[@]}"
+    if ! test ${#expout[*]} = ${#cmdout[*]}
+    then
+        echo "FAIL: command output did not contain ${#expout[*]} lines. Contained ${#cmdout[*]}: ${cmdout[*]}"
+        echo cmdout was: ${cmdout[@]}
+        exit 1
+    fi
+    test "${cmdout[@]}" = "${expout[@]}"
+}
+it_should_have_two_ansible_nodes() {
+
+    # Parse lines into array elements.
+    IFS=$'\n\t'
+    
+   cmdout=($(bash -c "rd nodes list -p $RUNDECK_PROJECT -F tags:ansible-nodes  | grep -v '^#' "))
+   expout=( $RUNDECK_NODE test-ansible-node )
+    echo "${cmdout[@]}"
+    if ! test ${#expout[*]} = ${#cmdout[*]}
+    then
+        echo "FAIL: command output did not contain ${#expout[*]} lines. Contained ${#cmdout[*]}: ${cmdout[*]}"
+        echo cmdout was: ${cmdout[@]}
+        exit 1
+    fi
+    let max=$(( ${#cmdout[*]} - 1 ))
+    for i in $(seq 0 $max) ; do
+        test "${cmdout[$i]}" = "${expout[$i]}"
+    done   
+}
+it_should_load_ansible_jobs() {
+
+    # load job file
+    bash -c "rd jobs load -p $RUNDECK_PROJECT --format xml -f $HOME/atest/ansible-jobs.xml"
+
+
+    # verify jobs exist
+
+    bash -c "rd jobs list -p $RUNDECK_PROJECT -i $JOBID -% '%id'"
+    bash -c "rd jobs list -p $RUNDECK_PROJECT -i $JOBID2 -% '%id'"
+    bash -c "rd jobs list -p $RUNDECK_PROJECT -i $JOBID3 -% '%id'"
+}
+
+it_should_run_ansible_module_step(){
+   bash -c "rd run -p $RUNDECK_PROJECT -i $RUN_MODULE_JOB -f | grep -v ^#" > test.output
+    # diff with expected
+    cat >expected.output <<END
+
+Using /etc/ansible/ansible.cfg as config file
+test-ansible-node | SUCCESS => {
+    "changed": false,
+    "ping": "pong"
+}
+rundeck1 | SUCCESS => {
+    "changed": false,
+    "ping": "pong"
+}
+END
+    # set +e
+    # diff expected.output test.output
+    # result=$?
+    # set -e
+    cat test.output
+    grep   'test-ansible-node | SUCCESS => {' test.output || ( echo "Expected output not seen" && exit 2 )
+    grep   "$RUNDECK_NODE | SUCCESS => {" test.output || ( echo "Expected output not seen" && exit 2 )
+}
+it_should_run_ansible_playbook_step(){
+     bash -c "rd run -p $RUNDECK_PROJECT -i $RUN_PLAYBOOK_JOB -f | grep -v ^#"  > test.output
+    # diff with expected
+
+    cat test.output
+    grep   'PLAY \[An example playbook\]' test.output || ( echo "Expected output not seen" && exit 2 )
+    grep   'ok: \[test-ansible-node\]' test.output || ( echo "Expected output not seen" && exit 2 )
+    grep   "ok: \[$RUNDECK_NODE\]" test.output || ( echo "Expected output not seen" && exit 2 )
+    grep   "TASK \[print the current date and time\]" test.output || ( echo "Expected output not seen" && exit 2 )
+    grep   "changed: \[$RUNDECK_NODE\] =>" test.output || ( echo "Expected output not seen" && exit 2 )
+    grep   "changed: \[test-ansible-node\] =>" test.output || ( echo "Expected output not seen" && exit 2 )
+    
+}
+it_should_run_ansible_script_step(){
+    bash -c "rd run -p $RUNDECK_PROJECT -i $RUN_SCRIPT_JOB -f --outformat '%node: %log' | grep -v ^#" > test.output
+    # diff with expected
+    
+    grep "$RUNDECK_NODE: DATE" test.output || ( echo "Expected output not seen" && exit 2 )
+    grep "$RUNDECK_NODE: UNAME" test.output || ( echo "Expected output not seen" && exit 2 )
+    grep "test-ansible-node: DATE" test.output || ( echo "Expected output not seen" && exit 2 )
+    grep "test-ansible-node: UNAME" test.output || ( echo "Expected output not seen" && exit 2 )
+
+}
diff --git a/test/docker/dockers/rundeckansible/tests/run-tests.sh b/test/docker/dockers/rundeckansible/tests/run-tests.sh
diff --git a/test/docker/test-ansible.sh b/test/docker/test-ansible.sh
diff --git a/test/docker/test-api.sh b/test/docker/test-api.sh
diff --git a/test/docker/test-ssl.sh b/test/docker/test-ssl.sh
diff --git a/test/docker/test.sh b/test/docker/test.sh
