Cloud 437 (#102)

* CLOUD-437

* fix syntax

* move userinput

* fix

* fix

* Update Jenkinsfile (#107)

* Update pim_17_ce.dev.yaml

* Update Jenkinsfile

* Update pim_17_ce.yaml

* Update pim_20_ce.dev.yaml

* Update pim_20_ce.yaml

* fix conflic

Author: mr-prud

.ci/Jenkinsfile

@@ -6,6 +6,9 @@ String launchUnitTests = "yes"
 String launchIntegrationTests = "yes"
 String[] pimVersions = ["1.7", "2.0"]
 String[] supportedPhpVersions = ["5.6", "7.0", "7.1"]
+String verboseOutputs = "yes"
+String dotsPerLine = "50"
+
 def clientConfig = [
     "php-http/guzzle6-adapter": ["phpVersion": supportedPhpVersions, "psrImplem": ["guzzlehttp/psr7"]],
     "php-http/guzzle5-adapter": ["phpVersion": supportedPhpVersions, "psrImplem": ["guzzlehttp/psr7", "zendframework/zend-diactoros", "slim/slim"]],
@@ -28,13 +31,19 @@ try {
                 string(defaultValue: pimVersions.join(','), description: 'PIM edition the tests should run on', name: 'requiredPimVersions'),
                 choice(choices: 'yes\nno', description: 'Run unit tests and code style checks', name: 'launchUnitTests'),
                 choice(choices: 'yes\nno', description: 'Run integration tests', name: 'launchIntegrationTests'),
+                choice(choices: 'no\nyes', description: 'Enable Verbose mode', name: 'verboseOutputs'),
+                string(defaultValue: '50', description: 'Number of dots per line', name: 'dotsperline'),
                 string(defaultValue: clients.join(','), description: 'Clients used to run integration tests (comma separated values)', name: 'clients'),
+                choice(choices: 'no\nyes', description: 'Enable Verbose mode', name: 'verboseOutputs'),
+                string(defaultValue: '50', description: 'Number of dots per line', name: 'dotsperline'),
             ])
 
             pimVersions = userInput['requiredPimVersions'].tokenize(',')
             launchUnitTests = userInput['launchUnitTests']
             launchIntegrationTests = userInput['launchIntegrationTests']
             clients = userInput['clients'].tokenize(',')
+            verboseOutputs = userInput['verboseOutputs']
+            dotsPerLine = userInput['dotsperline']
         }
         milestone 2
 
@@ -373,9 +382,10 @@ def runPim20IntegrationTest(String phpVersion, String client, String psrImplem)
         // Find and store PHP test integration files to launch them in parallels
         files += sh (returnStdout: true, script: 'find /home/jenkins/php-api-client/tests/v2_0/Api -name "*Integration.php"').tokenize('\n')
         files += sh (returnStdout: true, script: 'find /home/jenkins/php-api-client/tests/Common/Api -name "*Integration.php"').tokenize('\n')
+        def messages = new net.sf.json.JSONArray()
 
         for (file in files) {
-            messages.add([
+            def commands = [
                 // Export "php" container id into shared file (We use ''' has we don't want groovy interpolation for $)
                 // And clean kubernetes' docker prefix "docker://<container-id>" (Take care, pubsub uses Busybox's sed != GNU sed)
                 [container: "pubsub", script: '''sh -c "kubectl get pod \\${POD_NAME} -o jsonpath='{$.status.containerStatuses[?(@.name==\\"php\\")].containerID}' | sed 's#docker://##g' > /home/jenkins/php-container-id" '''],
@@ -397,10 +407,14 @@ def runPim20IntegrationTest(String phpVersion, String client, String psrImplem)
                     junit: [in: "/home/jenkins/php-api-client/", name: "junit_output.xml"],
                     script: 'php -d error_reporting="E_ALL" ./bin/phpunit -c phpunit.xml.dist '+file+' --log-junit junit_output.xml'
                 ]
-            ])
+            ]
+            def message = new net.sf.json.JSONObject()
+            message.put("name",file)
+            message.put("commands",commands)
+            messages.add(message)
         }
         return messages
-    })
+    }, verboseOutputs, dotsPerLine)
 }
 
 /**
@@ -541,7 +555,10 @@ def withPhpApi(String phpApiImageName, String phpVersion, body) {
  *  - (Init) php-api-client : Copy php-api-client sources to /home/jenkins/php-api-client (Used for K8s PIM's template)
  *  - (Run)  gcloud         : Used to manage pubsub queues and to create PIM's Kubernetes pods (Based on template)
  */
-def queue(String phpApiImageName, String pimImageName, String pimVersion, String phpVersion, body) {
+
+def queue(String phpApiImageName, String pimImageName, String pimVersion, String phpVersion, body, verboseOutputs, dotsPerLine) {
+    def verbosity = (verboseOutputs == "yes") ? "-v" : ""
+    def linesize = (dotsPerLine.isNumber())? dotsPerLine :"50"
     clearTemplateNames()
     def uuid = UUID.randomUUID().toString()
     // Maximum pods in parallel. Default set to number of messages
@@ -562,7 +579,7 @@ def queue(String phpApiImageName, String pimImageName, String pimVersion, String
     }
 
     podTemplate(name: "php-api-client-pubsub", label: "pubsub-" + uuid, containers: [
-        containerTemplate(name: "gcloud", ttyEnabled: true, command: 'cat', image: "eu.gcr.io/akeneo-ci/gcloud:1.0.17", resourceRequestCpu: '100m', resourceRequestMemory: '200Mi', envVars: [envVar(key: "PUBSUB_PROJECT_ID", value: "akeneo-ci")])
+        containerTemplate(name: "gcloud", ttyEnabled: true, command: 'cat', image: "eu.gcr.io/akeneo-ci/gcloud:1.0", alwaysPullImage: true, resourceRequestCpu: '100m', resourceRequestMemory: '200Mi', envVars: [envVar(key: "PUBSUB_PROJECT_ID", value: "akeneo-ci")])
     ], annotations: [
         podAnnotation(key: "pod.beta.kubernetes.io/init-containers", value:
         """
@@ -612,7 +629,7 @@ def queue(String phpApiImageName, String pimImageName, String pimVersion, String
                 try {
                     sh "cat /home/jenkins/php-api-client/.ci/k8s/${k8s_template}"
                     sh "kubectl apply -f /home/jenkins/php-api-client/.ci/k8s/${k8s_template}"
-                    sh "gcloud.phar job:wait ${env.NODE_NAME}-results-subscription ${size} ${env.WORKSPACE} --ansi"
+                    sh "gcloud.phar ${verbosity} job:wait --dotsperline ${linesize} ${env.NODE_NAME}-results-subscription ${size} ${env.WORKSPACE} --ansi"
                 } finally {
                     sh "kubectl delete job ${env.NODE_NAME}"
                     sh "gcloud.phar pubsub:topic:delete ${env.NODE_NAME}"

.ci/k8s/pim_17_ce.dev.yaml

@@ -103,7 +103,8 @@ spec:
       resources:
         requests: {cpu: "300m", memory: "300Mi"}
     - name: pubsub
-      image: eu.gcr.io/akeneo-ci/gcloud:1.0.17
+      image: eu.gcr.io/akeneo-ci/gcloud:1.0
+      imagePullPolicy: Always
       command: ["/bin/sh", "-c"]
       args:
         - |

.ci/k8s/pim_17_ce.yaml

@@ -85,7 +85,9 @@ spec:
           resources:
             requests: {cpu: "500m", memory: "750Mi"}
         - name: pubsub
-          image: eu.gcr.io/akeneo-ci/gcloud:1.0.17
+          image: eu.gcr.io/akeneo-ci/gcloud:1.0
+          imagePullPolicy: Always
+
           command: ["/bin/sh", "-c"]
           args:
             - |

.ci/k8s/pim_20_ce.dev.yaml

@@ -140,7 +140,9 @@ spec:
         timeoutSeconds: 1
         initialDelaySeconds: 5
     - name: pubsub
-      image: eu.gcr.io/akeneo-ci/gcloud:1.0.17
+      image: eu.gcr.io/akeneo-ci/gcloud:1.0
+      imagePullPolicy: Always
+
       command: ["/bin/sh", "-c"]
       args:
         - |

.ci/k8s/pim_20_ce.yaml

@@ -122,7 +122,8 @@ spec:
             timeoutSeconds: 1
             initialDelaySeconds: 5
         - name: pubsub
-          image: eu.gcr.io/akeneo-ci/gcloud:1.0.17
+          image: eu.gcr.io/akeneo-ci/gcloud:1.0
+          imagePullPolicy: Always
           command: ["/bin/sh", "-c"]
           args:
             - |