Change build command to use config file.

Change-Id: Ibafdaf073bf973f05a721f8422e48e1f581dc4a4

jenkins-tp/jobs/builders/fuel-ccp-gate.sh

@@ -8,11 +8,20 @@ pip install --upgrade pip
 
 pip install .
 
-ccp --images-maintainer mirantis@mirantis.com \
-    --images-namespace microbuild --images-tag latest \
-    --repositories-path containers/openstack --builder-no-cache \
-    --debug \
-build
+cat > ccp-test.yaml << EOF
+debug: True
+builder:
+  no_cache: True
+images:
+  namespace: microbuild
+  tag: latest
+  maintainer: mirantis@mirantis.com
+repositories:
+  path: containers/openstack
+  skip_empty: True
+EOF
+
+ccp --config-file ccp-test.yaml build
 
 deactivate
 

jenkins-tp/jobs/builders/mcp-build-images.sh

@@ -24,15 +24,22 @@ source mcp/bin/activate
 pip install .
 
 # Build images:
-ccp \
---builder-no-cache \
---builder-push \
---registry-address ${DOCKER_REGISTRY} \
---images-namespace ${DOCKER_NAMESPACE} \
---images-tag ${TAG} \
---images-maintainer ${IMAGES_MAINTAINER} \
---repositories-path ${REPOSITORIES_PATH} \
---debug \
-build
+cat > ccp-test.yaml << EOF
+debug: True
+builder:
+  no_cache: True
+  push: True
+images:
+  namespace: ${DOCKER_NAMESPACE}
+  tag: ${TAG}
+  maintainer: ${IMAGES_MAINTAINER}
+repositories:
+  path: ${REPOSITORIES_PATH}
+  skip_empty: True
+registry:
+  address: ${DOCKER_REGISTRY}
+EOF
+
+ccp --config-file ccp-test.yaml build
 
 deactivate

jenkins-tp/jobs/macros.yaml

@@ -126,15 +126,28 @@
     name: build-image
     builders:
       - shell: |
+          #!/bin/bash -xe
           virtualenv {name}env
           source {name}env/bin/activate
           pip install --upgrade pip
           pip install fuel-ccp/
-          ccp --images-maintainer mirantis@mirantis.com \
-              --images-namespace {name}build --images-tag latest \
-              --repositories-names {repos} --builder-no-cache \
-              --repositories-path containers/openstack \
-              build
+          cat > ccp-test.yaml << EOF
+          debug: True
+          builder:
+            no_cache: True
+          images:
+            namespace: {name}build
+            tag: latest
+            maintainer: mirantis@mirantis.com
+          repositories:
+            path: containers/openstack
+            skip_empty: True
+            names: [{repos}]
+          EOF
+
+          cat ccp-test.yaml
+          ccp --config-file ccp-test.yaml build
+
           deactivate
 
 - builder: