restore travis and add clone in the docker's build

.travis.yml

@@ -14,72 +14,56 @@ matrix:
     - python -m unittest discover
     - docker build -t alogo53/sure-tosca:3.0.0 .
     
+#------------sure_tosca-client-----------------    
+  - language: python
+    python: 3.8
+    before_script:
+    - cd sure_tosca-client_python_stubs
+    - pip install -r requirements.txt
+    - pip install -r test-requirements.txt
+    script:
+    - python -m unittest discover
     
+#------------semaphore-client------------------
+  - language: python
+    python: 3.8
+    before_script:
+    - cd semaphore-python-client-generated
+    - pip install -r requirements.txt
+    - pip install -r test-requirements.txt
+    script:
+    - python -m unittest discover    
     
+#------------planner------------------  
+  - language: python
+    python: 3.8
+    before_script:
+    - cd planner
+    - pip install -r requirements.txt
+    script:
+    - python -m unittest discover
+    - docker build -t alogo53/planner:3.0.0 .
     
+#------------deployer------------------  
+  - language: python
+    python: 3.8
+    before_script:
+    - cd deployer
+    - pip install -r requirements.txt
+    - cd ../semaphore-python-client-generated
+    - python setup.py install
+    - cd ../sure_tosca-client_python_stubs/
+    - python setup.py install
+    - cd ../deployer
+    script:
+    - python -m unittest discover
+    - docker build -t alogo53/deployer:3.0.0 .
 
-
-    
-##------------semaphore-client------------------
-  #- language: python
-    #python: 3.8
-    #before_script:
-    #- cd semaphore-python-client-generated
-    #- pip install -r requirements.txt
-    #- pip install -r test-requirements.txt
-    #script:
-    #- python -m unittest discover    
-    
-##------------planner------------------  
-  #- language: python
-    #python: 3.8
-    #before_script:
-    #- cd planner
-    #- pip install -r requirements.txt
-    #script:
-    #- python -m unittest discover
-    #- docker build -t alogo53/planner:3.0.0 .
-    
-##------------deployer------------------  
-  #- language: python
-    #python: 3.8
-    #before_script:
-    #- cd deployer
-    #- pip install -r requirements.txt
-    #- cd ../semaphore-python-client-generated
-    #- python setup.py install
-    #- cd ../sure_tosca-client_python_stubs/
-    #- python setup.py install
-    #- cd ../deployer
-    #script:
-    #- python -m unittest discover
-    #- docker build -t alogo53/deployer:3.0.0 .
-
-##------------manager and provisioner------------------      
-  #- language: java
-    #jdk: openjdk11
-    #before_script:
-    #- mvn -Dmaven.test.skip=true install
-    #script:
-    #- mvn test
-    #- cd manager
-    #- mvn -Dmaven.test.skip=true dockerfile:build
-    #- cd ../provisioner
-    #- mvn -Dmaven.test.skip=true dockerfile:build
-
-    
-    
-after_success:
-- 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 5 && count=$((count+1)) && if [ $count -gt 5 ]; then break;
-  fi; done
-  
-  
-    matrix:
-        include:
+#------------manager and provisioner------------------      
   - language: java
     jdk: openjdk11
+    before_script:
+    - mvn -Dmaven.test.skip=true install
     script:
     - mvn test
     - cd manager
@@ -88,29 +72,24 @@ after_success:
     - mvn -Dmaven.test.skip=true dockerfile:build
 
     
-            #------------sure_tosca-client-----------------    
-            - language: python
-                python: 3.8
-                before_script:
-                - cd sure_tosca-client_python_stubs
-                - pip install -r requirements.txt
-                - pip install -r test-requirements.txt
-                script:
-                - python -m unittest discover                
-    
-
-#- 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
     
+after_success:
+- 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 5 && count=$((count+1)) && if [ $count -gt 5 ]; then break;
+  fi; done
+- mvn test
+- 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
 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/CI-docker/java/Dockerfile

@@ -3,22 +3,31 @@ FROM maven:3.6.3-jdk-11
 MAINTAINER S. Koulouzis
 
 ARG SONAR_PROPERTIES_FILE=uva-conf.properties
+ENV GIT_URL=https://gitlab.articonf.eu:4430/uva/conf.git
+ENV FOLDER_NAME=conf
+ENV BRANCH=develop
 
 # Install SonarQube Dependency
 RUN wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.2.0.1873-linux.zip && \
     unzip sonar-scanner-cli-4.2.0.1873-linux.zip && \
     mv sonar-scanner-4.2.0.1873-linux /opt/sonar-scanner
     
+
 COPY clone_git.sh clone_git.sh
+RUN ./clone_git.sh $BRANCH $GIT_URL $FOLDER_NAME
 COPY build.sh build.sh
+RUN ./build.sh $FOLDER_NAME
+RUN download_dependencies.sh $FOLDER_NAME
+
 COPY send_to_sonarqube.sh send_to_sonarqube.sh 
 COPY ${SONAR_PROPERTIES_FILE} ${SONAR_PROPERTIES_FILE}
+COPY pull_git.sh pull_git.sh
 
-CMD ./clone_git.sh $BRANCH $GIT_URL $FOLDER_NAME && \ 
+CMD ./pull_git.sh $FOLDER_NAME && \ 
     ./build.sh $FOLDER_NAME && \
     ./send_to_sonarqube.sh $FOLDER_NAME $SONAR_HOST $SONAR_LOGIN $SONAR_PROPERTIES_FILE
     
     
     
-# docker build -t java_ci -build-arg SONAR_PROPERTIES_FILE=uva-conf.properties .
+# sudo docker build -t java_ci --build-arg SONAR_PROPERTIES_FILE=uva-conf.properties --build-arg GIT_URL=https://gitlab.articonf.eu:4430/uva/conf.git --build-arg FOLDER_NAME=conf --build-arg FOLDER_NAME=develop .
 # docker run -it -e BRANCH=develop -e GIT_URL=https://gitlab.articonf.eu:4430/uva/conf.git -e FOLDER_NAME=conf -e SONAR_HOST=https://sonar.articonf.eu/ -e SONAR_LOGIN= -e SONAR_PROPERTIES_FILE=uva-conf.properties -e FOLDER_NAME=conf java_ci

bin/CI-docker/java/pull_git.sh

+#!/bin/bash
+
+SRC=$1
+
+
+cd $SRC
+
+git pull 
+
+

bin/CI-docker/java/uva-conf.properties

+# Project properties
+sonar.projectKey=articonf-uva-conf
+sonar.projectName=articonf-uva-conf
+sonar.projectVersion=1.0
+sonar.sourceEncoding=UTF-8
+sonar.sources=.
+sonar.java.binaries=**provisioner/target/classes,**manager/target/classes,**commons/target/classes
+#sonar.exclusions=**/*.java,**/*.jav