change docker repo

.travis.yml

@@ -12,7 +12,7 @@ matrix:
     - pip install -r test-requirements.txt
     script:
     - python -m unittest discover
-    - docker build -t alogo53/sure-tosca:3.0.0 .
+    - docker build -t qcdia/sure-tosca:3.0.0 .
     
 #------------sure_tosca-client-----------------    
   - language: python
@@ -37,7 +37,8 @@ matrix:
     - pip install -r test-requirements.txt
     - docker stack deploy conf -c docker-compose-test.yml
     - count=0 && until $(curl --output /dev/null --silent --head --fail http://localhost:8081);
-    do printf '.' && sleep 10 && count=$((count+1)) && if [ $count -gt 5 ]; then break;    
+    do printf '.' && sleep 10 && count=$((count+1)) && if [ $count -gt 5 ]; then break;
+    fi; done    
     script:
     - python -m unittest discover    
     
@@ -49,10 +50,11 @@ matrix:
     - pip install -r requirements.txt
     - docker stack deploy conf -c docker-compose-test.yml
     - count=0 && until $(curl --output /dev/null --silent --head --fail http://localhost:8081);
-    do printf '.' && sleep 10 && count=$((count+1)) && if [ $count -gt 5 ]; then break;    
+    do printf '.' && sleep 10 && count=$((count+1)) && if [ $count -gt 5 ]; then break;
+    fi; done    
     script:
     - python -m unittest discover
-    - docker build -t alogo53/planner:3.0.0 .
+    - docker build -t qcdia/planner:3.0.0 .
     
 #------------deployer------------------  
   - language: python
@@ -67,10 +69,11 @@ matrix:
     - cd ../deployer
     - docker stack deploy conf -c docker-compose-test.yml
     - count=0 && until $(curl --output /dev/null --silent --head --fail http://localhost:8081);
-    do printf '.' && sleep 10 && count=$((count+1)) && if [ $count -gt 5 ]; then break;    
+    do printf '.' && sleep 10 && count=$((count+1)) && if [ $count -gt 5 ]; then break;
+    fi; done   
     script:
     - python -m unittest discover
-    - docker build -t alogo53/deployer:3.0.0 .
+    - docker build -t qcdia/deployer:3.0.0 .
 
 #------------manager and provisioner------------------      
   - language: java
@@ -80,6 +83,7 @@ matrix:
     - docker stack deploy conf -c docker-compose-test.yml
     - count=0 && until $(curl --output /dev/null --silent --head --fail http://localhost:8081);
     do printf '.' && sleep 10 && count=$((count+1)) && if [ $count -gt 5 ]; then break;
+    fi; done  
     script:
     - mvn test
     - cd manager
@@ -91,16 +95,16 @@ matrix:
     
 after_success:
 - docker login -u $DOCKER_USER -p $DOCKER_PASS
-- docker tag manager:3.0.0 alogo53/manager:3.0.0
-- docker push alogo53/manager:3.0.0
-- docker tag sure-tosca:3.0.0 alogo53/sure-tosca:3.0.0
-- docker push alogo53/sure-tosca:3.0.0
-- docker tag planner:3.0.0 alogo53/planner:3.0.0
-- docker push alogo53/planner:3.0.0
-- docker tag provisioner:3.0.0 alogo53/provisioner:3.0.0
-- docker push alogo53/provisioner:3.0.0
-- docker tag deployer:3.0.0 alogo53/deployer:3.0.0
-- docker push alogo53/deployer:3.0.0
+- docker tag manager:3.0.0 qcdia/manager:3.0.0
+- docker push qcdia/manager:3.0.0
+- docker tag sure-tosca:3.0.0 qcdia/sure-tosca:3.0.0
+- docker push qcdia/sure-tosca:3.0.0
+- docker tag planner:3.0.0 qcdia/planner:3.0.0
+- docker push qcdia/planner:3.0.0
+- docker tag provisioner:3.0.0 qcdia/provisioner:3.0.0
+- docker push qcdia/provisioner:3.0.0
+- docker tag deployer:3.0.0 qcdia/deployer:3.0.0
+- docker push qcdia/deployer:3.0.0
 env:
   global:
   - secure: ymUnVWoFsn6dGShBx+mJvOOtkdTdtkXuKDWUxDitn+M5SVYdFUGN+UbvrMp8hKQfC8ZQT+/sOGIvdWWE2ruQEeAx9cBSQ4+4x7eup7kORNxzAH2OplWZwoYh+TAl3zx/kHiVh5k6+GnoRWPS3fDvlb/AALdUCsUtz3JzUpYLeAWPfs7czc8frc3gBvnBwORC4iomSrAw+/cmjPhcysyq7zMCnpiriC/APstbotzAuOzDyeOds8pZqUuUri8XKlzlMQtIqVX851S/P/dwf5XcOTX1RUFhRCcYosmkbfR98nabYekhbSyW/ONMQdGMsdurDLJ4obxbD4c/zijvZfUTWMWZnDIlmR1dTy9at8lNJ7OPQw7zHDkj1T4YuofrBZ+LNlDYz7Ad2U6Uo3vD8bTcgaBk9I/0/inJ4JjE6hAxCl9V19revyy+/89ogA7v30cTXW48tJ8JziZqmyXUYR4eLZGyTlR3Ee79Bsu3vsTqX06/8IWFbc1XfIg6ZrwsP1EfCTRDiK4nqAGInhiLo1x9y3kdZkI3X0m90Jr88T8VpUIp1Dvp7OScpEXnE/J1Lgo3e082l1k4ehXTb6ocwKrA3gSlKFV6vJCIhxmU9nUO67axzBz6Sz4gaY//+jhoDL59UOsUQ/dJATVmawkQJIVH1EcU42SD64bAGvjS1mSFEek=

bin/test.sh

 #!/bin/bash
 
+
+docker stack deploy conf-test -c ../docker-compose-test.yml
+
+sure_tosca_url=http://localhost:8081
+
+count=0 && until $(curl --output /dev/null --silent --head --fail "$sure_tosca_url"); do printf '.' && sleep 10 && count=$((count+1)) && if [ $count -gt 5 ]; then break; fi; done  
+
+
+if curl --output /dev/null --silent --head --fail "$sure_tosca_url"; then
+  printf '%s\n' "$sure_tosca_url exist"
+else
+  printf '%s\n' "$sure_tosca_url does not exist"
+fi
+
+
 cd ../
 mvn test
 status=$?
-[ $status -eq 0 ] && echo "-------Java tests successful------" || exit -1
+[ $status -eq 0 ] && echo "------- Java tests successful------" || exit -1
 
 cd planner && venv/bin/python3 -m unittest discover
 status=$?
-[ $status -eq 0 ] && echo "-------Planner tests successful------" || exit -1
+[ $status -eq 0 ] && echo "------- Planner tests successful------" || exit -1
 
 cd ../
 cd sure_tosca-flask-server && venv/bin/python3 -m unittest discover
 status=$?
-[ $status -eq 0 ] && echo "-------sure_tosca-flask-server tests successful------" || exit -1
+[ $status -eq 0 ] && echo "------- sure_tosca-flask-server tests successful------" || exit -1
 
+cd ../
+cd sure_tosca-client_python_stubs  && venv/bin/python3 -m unittest discover
+status=$?
+[ $status -eq 0 ] && echo "------- sure_tosca-client_python_stubs tests successful------" || exit -1
+
+
+cd ../
+cd semaphore-python-client-generated  && venv/bin/python3 -m unittest discover
+status=$?
+[ $status -eq 0 ] && echo "------- semaphore-python-client-generated tests successful------" || exit -1
+
+
+cd ../
+cd deployer  && venv/bin/python3 -m unittest discover
+status=$?
+[ $status -eq 0 ] && echo "------- deployer tests successful------" || exit -1
 
+docker stack rm conf-test

docker-compose-test.yml

@@ -31,6 +31,6 @@ services:
       - mysql
             
   sure-tosca:
-    image: sure-tosca:3.0.0
+    image: qcdia/sure-tosca:3.0.0
     ports: 
       - "8081:8081"