From 145d5f835cbd95ed9d71958127a6e4af9de20e9e Mon Sep 17 00:00:00 2001
From: Piotr Maslanka <piotr.maslanka@henrietta.com.pl>
Date: Sat, 25 Mar 2017 12:31:09 +0100
Subject: [PATCH] meta

---
 .gitlab-ci.yml | 69 ++++++++++++++++++++++++++++----------------------
 make.py        |  3 +--
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 551acc7..4e762b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,25 @@
 
+stages:
+  - build
+  - deploy
+deploy_localhost:
+  stage: deploy
+  environment:
+    name: local
+    url: http://dev.dms-serwis.com.pl
+  script:
+    - vagrant box remove $PREFIX/$BOX
+    - vagrant box add $PREFIX/$BOX file:///var/www/html/dev/vagrant/$BOX.box
+    - vagrant box remove $PREFIX/$BOX
+    - vagrant box add $PREFIX/$BOX file:///var/www/html/dev/vagrant/$BOX.box
+    - vagrant box remove $PREFIX/$BOX
+    - vagrant box add $PREFIX/$BOX file:///var/www/html/dev/vagrant/$BOX.box
+    - vagrant box remove $PREFIX/$BOX
+    - vagrant box add $PREFIX/$BOX file:///var/www/html/dev/vagrant/$BOX.box
+    - vagrant box remove $PREFIX/$BOX
+    - vagrant box add $PREFIX/$BOX file:///var/www/html/dev/vagrant/$BOX.box
+    - vagrant box remove $PREFIX/$BOX
+    - vagrant box add $PREFIX/$BOX file:///var/www/html/dev/vagrant/$BOX.box
 build_cassandra:
   only:
     - master
@@ -8,16 +29,14 @@ build_cassandra:
     - vagrant
     - develop19216822423
   before_script:
-    - python /vagrant/make.py meta
-    - cp /vagrant/*.sh cassandra/
-    - cp /vagrant/SkeletonVagrantfile cassandra/Vagrantfile
+    - cp *.sh cassandra/
+    - cp SkeletonVagrantfile cassandra/Vagrantfile
     - cd cassandra
+    - python ../make.py meta
   script:
     - vagrant up
     - vagrant package --out cassandra.box
     - mv -f cassandra.box /var/www/html/dev/vagrant/cassandra.box
-    - vagrant box remove henrietta//cassandra
-    - vagrant box add henrietta//cassandra file:///var/www/html/dev/vagrant/cassandra.box
     - cd ..
   after_script:
     - vagrant destroy -f
@@ -32,16 +51,14 @@ build_cass_zk_rmq:
     - vagrant
     - develop19216822423
   before_script:
-    - python /vagrant/make.py meta
-    - cp /vagrant/*.sh cass_zk_rmq/
-    - cp /vagrant/SkeletonVagrantfile cass_zk_rmq/Vagrantfile
+    - cp *.sh cass_zk_rmq/
+    - cp SkeletonVagrantfile cass_zk_rmq/Vagrantfile
     - cd cass_zk_rmq
+    - python ../make.py meta
   script:
     - vagrant up
     - vagrant package --out cass_zk_rmq.box
     - mv -f cass_zk_rmq.box /var/www/html/dev/vagrant/cass_zk_rmq.box
-    - vagrant box remove henrietta//cass_zk_rmq
-    - vagrant box add henrietta//cass_zk_rmq file:///var/www/html/dev/vagrant/cass_zk_rmq.box
     - cd ..
   after_script:
     - vagrant destroy -f
@@ -56,16 +73,14 @@ build_czr_pythons:
     - vagrant
     - develop19216822423
   before_script:
-    - python /vagrant/make.py meta
-    - cp /vagrant/*.sh czr_pythons/
-    - cp /vagrant/SkeletonVagrantfile czr_pythons/Vagrantfile
+    - cp *.sh czr_pythons/
+    - cp SkeletonVagrantfile czr_pythons/Vagrantfile
     - cd czr_pythons
+    - python ../make.py meta
   script:
     - vagrant up
     - vagrant package --out czr_pythons.box
     - mv -f czr_pythons.box /var/www/html/dev/vagrant/czr_pythons.box
-    - vagrant box remove henrietta//czr_pythons
-    - vagrant box add henrietta//czr_pythons file:///var/www/html/dev/vagrant/czr_pythons.box
     - cd ..
   after_script:
     - vagrant destroy -f
@@ -80,16 +95,14 @@ build_czr_pythons_pg:
     - vagrant
     - develop19216822423
   before_script:
-    - python /vagrant/make.py meta
-    - cp /vagrant/*.sh czr_pythons_pg/
-    - cp /vagrant/SkeletonVagrantfile czr_pythons_pg/Vagrantfile
+    - cp *.sh czr_pythons_pg/
+    - cp SkeletonVagrantfile czr_pythons_pg/Vagrantfile
     - cd czr_pythons_pg
+    - python ../make.py meta
   script:
     - vagrant up
     - vagrant package --out czr_pythons_pg.box
     - mv -f czr_pythons_pg.box /var/www/html/dev/vagrant/czr_pythons_pg.box
-    - vagrant box remove henrietta//czr_pythons_pg
-    - vagrant box add henrietta//czr_pythons_pg file:///var/www/html/dev/vagrant/czr_pythons_pg.box
     - cd ..
   after_script:
     - vagrant destroy -f
@@ -104,16 +117,14 @@ build_nodejs4:
     - vagrant
     - develop19216822423
   before_script:
-    - python /vagrant/make.py meta
-    - cp /vagrant/*.sh nodejs4/
-    - cp /vagrant/SkeletonVagrantfile nodejs4/Vagrantfile
+    - cp *.sh nodejs4/
+    - cp SkeletonVagrantfile nodejs4/Vagrantfile
     - cd nodejs4
+    - python ../make.py meta
   script:
     - vagrant up
     - vagrant package --out nodejs4.box
     - mv -f nodejs4.box /var/www/html/dev/vagrant/nodejs4.box
-    - vagrant box remove henrietta//nodejs4
-    - vagrant box add henrietta//nodejs4 file:///var/www/html/dev/vagrant/nodejs4.box
     - cd ..
   after_script:
     - vagrant destroy -f
@@ -128,16 +139,14 @@ build_nodejs5_jdk_adk25:
     - vagrant
     - develop19216822423
   before_script:
-    - python /vagrant/make.py meta
-    - cp /vagrant/*.sh nodejs5_jdk_adk25/
-    - cp /vagrant/SkeletonVagrantfile nodejs5_jdk_adk25/Vagrantfile
+    - cp *.sh nodejs5_jdk_adk25/
+    - cp SkeletonVagrantfile nodejs5_jdk_adk25/Vagrantfile
     - cd nodejs5_jdk_adk25
+    - python ../make.py meta
   script:
     - vagrant up
     - vagrant package --out nodejs5_jdk_adk25.box
     - mv -f nodejs5_jdk_adk25.box /var/www/html/dev/vagrant/nodejs5_jdk_adk25.box
-    - vagrant box remove henrietta//nodejs5_jdk_adk25
-    - vagrant box add henrietta//nodejs5_jdk_adk25 file:///var/www/html/dev/vagrant/nodejs5_jdk_adk25.box
     - cd ..
   after_script:
     - vagrant destroy -f
diff --git a/make.py b/make.py
index 2ae62b7..dc89941 100644
--- a/make.py
+++ b/make.py
@@ -28,8 +28,7 @@ deploy_localhost:
             for box in boxes:
                 ci.write('''
     - vagrant box remove $PREFIX/$BOX
-    - vagrant box add $PREFIX/$BOX file:///var/www/html/dev/vagrant/$BOX.box
-''')
+    - vagrant box add $PREFIX/$BOX file:///var/www/html/dev/vagrant/$BOX.box''')
             for box in boxes:
                 ci.write(b'''
 build_$BOX:
-- 
GitLab