diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e762b6c79d2fbfee876d61c5257daef0dd52c68..1bdb0cf62439fe586594e1ecc4d26d54ec4712e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,22 +8,17 @@ deploy_localhost: 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 +deploy_cassandra: + when: manual + stage: deploy + tags: + - vagrant + - develop19216822423 + script: + - vagrant box remove henrietta//cassandra + - vagrant box add henrietta/ /cassandra file:///var/www/html/dev/vagrant/cassandra.box build_cassandra: - only: - - master - - /^cassandra\-(.*)$/ + when: manual stage: build tags: - vagrant @@ -42,10 +37,17 @@ build_cassandra: - vagrant destroy -f - cd .. +deploy_cass_zk_rmq: + when: manual + stage: deploy + tags: + - vagrant + - develop19216822423 + script: + - vagrant box remove henrietta//cass_zk_rmq + - vagrant box add henrietta/ /cass_zk_rmq file:///var/www/html/dev/vagrant/cass_zk_rmq.box build_cass_zk_rmq: - only: - - master - - /^cass_zk_rmq\-(.*)$/ + when: manual stage: build tags: - vagrant @@ -64,10 +66,17 @@ build_cass_zk_rmq: - vagrant destroy -f - cd .. +deploy_czr_pythons: + when: manual + stage: deploy + tags: + - vagrant + - develop19216822423 + script: + - vagrant box remove henrietta//czr_pythons + - vagrant box add henrietta/ /czr_pythons file:///var/www/html/dev/vagrant/czr_pythons.box build_czr_pythons: - only: - - master - - /^czr_pythons\-(.*)$/ + when: manual stage: build tags: - vagrant @@ -86,10 +95,17 @@ build_czr_pythons: - vagrant destroy -f - cd .. +deploy_czr_pythons_pg: + when: manual + stage: deploy + tags: + - vagrant + - develop19216822423 + script: + - vagrant box remove henrietta//czr_pythons_pg + - vagrant box add henrietta/ /czr_pythons_pg file:///var/www/html/dev/vagrant/czr_pythons_pg.box build_czr_pythons_pg: - only: - - master - - /^czr_pythons_pg\-(.*)$/ + when: manual stage: build tags: - vagrant @@ -108,10 +124,17 @@ build_czr_pythons_pg: - vagrant destroy -f - cd .. +deploy_nodejs4: + when: manual + stage: deploy + tags: + - vagrant + - develop19216822423 + script: + - vagrant box remove henrietta//nodejs4 + - vagrant box add henrietta/ /nodejs4 file:///var/www/html/dev/vagrant/nodejs4.box build_nodejs4: - only: - - master - - /^nodejs4\-(.*)$/ + when: manual stage: build tags: - vagrant @@ -130,10 +153,17 @@ build_nodejs4: - vagrant destroy -f - cd .. +deploy_nodejs5_jdk_adk25: + when: manual + stage: deploy + tags: + - vagrant + - develop19216822423 + script: + - vagrant box remove henrietta//nodejs5_jdk_adk25 + - vagrant box add henrietta/ /nodejs5_jdk_adk25 file:///var/www/html/dev/vagrant/nodejs5_jdk_adk25.box build_nodejs5_jdk_adk25: - only: - - master - - /^nodejs5_jdk_adk25\-(.*)$/ + when: manual stage: build tags: - vagrant diff --git a/run.sh b/run.sh index e59f247ad6eafbc19cf744c630af6be1e3976e2e..e21421d628346225205b1165bf816b01c38b2b04 100644 --- a/run.sh +++ b/run.sh @@ -2,8 +2,8 @@ shutdown -h +30 "Timeout on VM creation" -if [ ! -f "build.sh" ]; then - sudo -H -u vagrant bash build_as_vagrant.sh +if [ ! -f "/vagrant/build.sh" ]; then + sudo -H -u vagrant bash /vagrant/build_as_vagrant.sh else - bash build.sh + bash /vagrant/build.sh fi \ No newline at end of file