diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71b55ae504cd7e53b44070522315c54059976bf2..835b63dae6eb2a8c58292e57555b8a066d9312b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,19 +15,20 @@ build_czr_pythons: before_script: - cp *.sh czr_pythons/ - cp SkeletonVagrantfile czr_pythons/Vagrantfile + - cd $CI_PROJECT_DIR - cd czr_pythons - python ../make.py meta - cd .. script: + - cd $CI_PROJECT_DIR - cd czr_pythons - vagrant up - vagrant package --out czr_pythons.box - mv -f czr_pythons.box /var/www/html/dev/vagrant/czr_pythons.box - - cd .. after_script: + - cd $CI_PROJECT_DIR - cd czr_pythons - vagrant destroy -f - - cd .. deploy_czr_pythons_pg: stage: deploy @@ -45,19 +46,20 @@ build_czr_pythons_pg: before_script: - cp *.sh czr_pythons_pg/ - cp SkeletonVagrantfile czr_pythons_pg/Vagrantfile + - cd $CI_PROJECT_DIR - cd czr_pythons_pg - python ../make.py meta - cd .. script: + - cd $CI_PROJECT_DIR - cd czr_pythons_pg - vagrant up - vagrant package --out czr_pythons_pg.box - mv -f czr_pythons_pg.box /var/www/html/dev/vagrant/czr_pythons_pg.box - - cd .. after_script: + - cd $CI_PROJECT_DIR - cd czr_pythons_pg - vagrant destroy -f - - cd .. deploy_nodejs4: stage: deploy @@ -75,19 +77,20 @@ build_nodejs4: before_script: - cp *.sh nodejs4/ - cp SkeletonVagrantfile nodejs4/Vagrantfile + - cd $CI_PROJECT_DIR - cd nodejs4 - python ../make.py meta - cd .. script: + - cd $CI_PROJECT_DIR - cd nodejs4 - vagrant up - vagrant package --out nodejs4.box - mv -f nodejs4.box /var/www/html/dev/vagrant/nodejs4.box - - cd .. after_script: + - cd $CI_PROJECT_DIR - cd nodejs4 - vagrant destroy -f - - cd .. deploy_nodejs5_jdk_adk25: stage: deploy @@ -105,16 +108,17 @@ build_nodejs5_jdk_adk25: before_script: - cp *.sh nodejs5_jdk_adk25/ - cp SkeletonVagrantfile nodejs5_jdk_adk25/Vagrantfile + - cd $CI_PROJECT_DIR - cd nodejs5_jdk_adk25 - python ../make.py meta - cd .. script: + - cd $CI_PROJECT_DIR - cd nodejs5_jdk_adk25 - vagrant up - vagrant package --out nodejs5_jdk_adk25.box - mv -f nodejs5_jdk_adk25.box /var/www/html/dev/vagrant/nodejs5_jdk_adk25.box - - cd .. after_script: + - cd $CI_PROJECT_DIR - cd nodejs5_jdk_adk25 - vagrant destroy -f - - cd .. diff --git a/czr_pythons_pg/README.md b/czr_pythons_pg/README.md deleted file mode 100644 index 273aed369341c0fc1fea392ba8fad1296dfee295..0000000000000000000000000000000000000000 --- a/czr_pythons_pg/README.md +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - ---- - -Usage in Vagrantfile: -``` -config.vm.box = "henrietta/czr_pythons_pg" -config.vm.box_url = "http://dev.dms-serwis.com.pl/vagrant/czr_pythons_pg.box" -``` diff --git a/czr_pythons_pg/build.sh b/czr_pythons_pg/build.sh deleted file mode 100644 index 7925495bb0865fc250f08128898d87fad95a26f4..0000000000000000000000000000000000000000 --- a/czr_pythons_pg/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -apt-get install -y python python-pip python-dev python-setuptools build-essential git libffi-dev libyaml-dev libev4 libev-dev libpq-dev -pip install --upgrade pip==1.5.6 -pip install --upgrade setuptools==5.5.1 -pip install --upgrade cffi - - -wynurz java -wynurz cassandra -wynurz zookeeeper -wynurz rabbitmq -wynurz postgresql - -pip install cassandra-driver kazoo CoolAMQP requests futures six monotonic nose mock coverage psycopg2cffi wheel diff --git a/make.py b/make.py index 422fb83c000cae35f51644997f74a1f29c090100..d435a9de45c5d225cb2c04c4a8b151cc0f005b98 100644 --- a/make.py +++ b/make.py @@ -89,19 +89,20 @@ build_$BOX: before_script: - cp *.sh $BOX/ - cp SkeletonVagrantfile $BOX/Vagrantfile + - cd $CI_PROJECT_DIR - cd $BOX - python ../make.py meta - cd .. script: + - cd $CI_PROJECT_DIR - cd $BOX - vagrant up - vagrant package --out $BOX.box - mv -f $BOX.box /var/www/html/dev/vagrant/$BOX.box - - cd .. after_script: + - cd $CI_PROJECT_DIR - cd $BOX - vagrant destroy -f - - cd .. '''.replace('$BOX', box).replace('$PREFIX', PREFIX).replace('\n', os.linesep)) if len(gitlabci) == 0: