Fixed deploy tests and add them to CI.

Author: ashcherbakov

Makefile.test

@@ -72,7 +72,7 @@ test_deploy_env_build: image test_deploy_image
 	docker run -d --name ${TEST_DEPLOY_NODE} --tmpfs /tmp --tmpfs /run --tmpfs /run/lock \
 		-v /sys/fs/cgroup:/sys/fs/cgroup:ro --network ${LOCALNET_DOCKER_NETWORK} ${TEST_DEPLOY_IMAGE_NAME}
 
-test_deploy_env_clean: localnet_reset
+test_deploy_env_clean:
 	docker rm -f ${TEST_DEPLOY_NODE}
 
 .PHONY: localnet_init localnet_start localnet_stop localnet_clean localnet_export \

integration_tests/deploy/test_deploy.sh

@@ -27,6 +27,7 @@ TEST_NODE="test_deploy_node"
 random_string account
 
 cleanup() {
+    make test_deploy_env_clean
     make localnet_clean
 }
 trap cleanup EXIT
@@ -35,7 +36,7 @@ trap cleanup EXIT
 test_divider
 
 echo "Prepare the environment"
-make localnet_rebuild localnet_start
+make build install localnet_rebuild localnet_start
 make test_deploy_env_build
 # ensure that the pool is ready
 wait_for_height 2 20
@@ -71,7 +72,7 @@ docker exec -u "$DCL_USER" "$TEST_NODE" dcld tx validator add-node --pubkey="$vp
 
 echo "Check node \"$TEST_NODE\" is in the validator set"
 result=$(dcld query validator all-nodes)
-check_response "$result" "\"name\": \"$TEST_NODE\""
+check_response "$result" "\"moniker\": \"$TEST_NODE\""
 check_response "$result" "\"pubKey\":$vpubkey" raw
 
 echo "PASSED"

integration_tests/run-all.sh

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Possible values: all (default) | cli | light | rest | cli,light | cli,rest | light, rest | cli,light,rest
+# Possible values: all (default) | cli | light | rest | deploy | cli,light | cli,rest | light, rest | cli,light,rest | etc.
 TESTS_TO_RUN=${1:-all}
 
 DETAILED_OUTPUT=true
@@ -170,4 +170,15 @@ if [[ $TESTS_TO_RUN =~ "all" || $TESTS_TO_RUN =~ "rest" ]]; then
 
     cleanup_pool
   done
+fi
+
+# Deploy tests
+if [[ $TESTS_TO_RUN =~ "all" || $TESTS_TO_RUN =~ "deploy" ]]; then
+    DEPLOY_SHELL_TEST="./integration_tests/deploy/test_deploy.sh"
+    if bash "$DEPLOY_SHELL_TEST" &>${DETAILED_OUTPUT_TARGET}; then
+      log "$DEPLOY_SHELL_TEST finished successfully"
+    else
+      log "$DEPLOY_SHELL_TEST failed"
+      exit 1
+    fi
 fi

scripts/cosmos-base-swagger-gen.sh

@@ -45,4 +45,5 @@ mv "$out_file/apidocs.swagger.json" "$out_file/$DEST_FILE"
 sed -i "s/\"version\": \"version not set\"/\"version\": \"$COSMOS_SDK_VERSION\",\"description\": \"$DESC\"/g" "$out_file/$DEST_FILE"
 
 # clean swagger files
+cd ../..
 rm -rf ./tmp-swagger-gen