From 84c1455b4c0c89bb2b860af1073d218d9d98f41d Mon Sep 17 00:00:00 2001 From: Piotr Maslanka <piotr.maslanka@henrietta.com.pl> Date: Tue, 28 Mar 2017 15:16:40 +0200 Subject: [PATCH] cze_pythons_pg fixed --- .gitlab-ci.yml | 93 --------------------------- czr_pythons/README.md | 23 ------- czr_pythons/build.sh | 12 ---- nodejs4/README.md | 22 ------- nodejs4/build.sh | 5 -- nodejs5_jdk_adk25/README.md | 47 -------------- nodejs5_jdk_adk25/build_as_vagrant.sh | 23 ------- 7 files changed, 225 deletions(-) delete mode 100644 czr_pythons/README.md delete mode 100644 czr_pythons/build.sh delete mode 100644 nodejs4/README.md delete mode 100644 nodejs4/build.sh delete mode 100644 nodejs5_jdk_adk25/README.md delete mode 100644 nodejs5_jdk_adk25/build_as_vagrant.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 835b63d..9ee2a19 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,35 +1,4 @@ -deploy_czr_pythons: - stage: deploy - tags: - - vagrant - - develop19216822423 - script: - - vagrant box remove henrietta/czr_pythons || true - - vagrant box add henrietta/czr_pythons file:///var/www/html/dev/vagrant/czr_pythons.box -build_czr_pythons: - stage: build - tags: - - vagrant - - develop19216822423 - 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 - after_script: - - cd $CI_PROJECT_DIR - - cd czr_pythons - - vagrant destroy -f - deploy_czr_pythons_pg: stage: deploy tags: @@ -60,65 +29,3 @@ build_czr_pythons_pg: - cd $CI_PROJECT_DIR - cd czr_pythons_pg - vagrant destroy -f - -deploy_nodejs4: - stage: deploy - tags: - - vagrant - - develop19216822423 - script: - - vagrant box remove henrietta/nodejs4 || true - - vagrant box add henrietta/nodejs4 file:///var/www/html/dev/vagrant/nodejs4.box -build_nodejs4: - stage: build - tags: - - vagrant - - develop19216822423 - 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 - after_script: - - cd $CI_PROJECT_DIR - - cd nodejs4 - - vagrant destroy -f - -deploy_nodejs5_jdk_adk25: - stage: deploy - tags: - - vagrant - - develop19216822423 - script: - - vagrant box remove henrietta/nodejs5_jdk_adk25 || true - - vagrant box add henrietta/nodejs5_jdk_adk25 file:///var/www/html/dev/vagrant/nodejs5_jdk_adk25.box -build_nodejs5_jdk_adk25: - stage: build - tags: - - vagrant - - develop19216822423 - 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 - after_script: - - cd $CI_PROJECT_DIR - - cd nodejs5_jdk_adk25 - - vagrant destroy -f diff --git a/czr_pythons/README.md b/czr_pythons/README.md deleted file mode 100644 index 13346f8..0000000 --- a/czr_pythons/README.md +++ /dev/null @@ -1,23 +0,0 @@ -# czr_pythons - -Cassandra, ZooKeeper, RabbitMQ and assorted Pythons - -It's [cass_zk_rmq](/cass_zk_rmq) but with extra: -* build-essentials -* git -* Python 2.7 -* cassandra, kazoo and CoolAMQP -* common utility and testing libraries - - - - - - ---- - -Usage in Vagrantfile: -``` -config.vm.box = "henrietta/czr_pythons" -config.vm.box_url = "http://dev.dms-serwis.com.pl/vagrant/czr_pythons.box" -``` diff --git a/czr_pythons/build.sh b/czr_pythons/build.sh deleted file mode 100644 index e56f5aa..0000000 --- a/czr_pythons/build.sh +++ /dev/null @@ -1,12 +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 -pip install --upgrade pip==1.5.6 -pip install --upgrade setuptools==5.5.1 - -# Install RabbitMQ -$(wynurz java && -wynurz cassandra && -wynurz rabbitmq && -wynurz zookeeper) & - -pip install cassandra-driver kazoo CoolAMQP requests futures six monotonic nose mock diff --git a/nodejs4/README.md b/nodejs4/README.md deleted file mode 100644 index 2430407..0000000 --- a/nodejs4/README.md +++ /dev/null @@ -1,22 +0,0 @@ -# nodejs4 - -NodeJS 4 + bower + gulp - -* NodeJS 4.x -* bower -* gulp -* git -* build-essential -* curl - - - - - ---- - -Usage in Vagrantfile: -``` -config.vm.box = "henrietta/nodejs4" -config.vm.box_url = "http://dev.dms-serwis.com.pl/vagrant/nodejs4.box" -``` diff --git a/nodejs4/build.sh b/nodejs4/build.sh deleted file mode 100644 index 2b8b642..0000000 --- a/nodejs4/build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -wynurz node4 -npm cache clean -npm install -g --unsafe-perm bower gulp diff --git a/nodejs5_jdk_adk25/README.md b/nodejs5_jdk_adk25/README.md deleted file mode 100644 index 6c51d80..0000000 --- a/nodejs5_jdk_adk25/README.md +++ /dev/null @@ -1,47 +0,0 @@ -# nodejs5_jdk_adk25 - -NodeJS 5.x + JDK + ADT + cordova - -* NodeJS 5.12 -* bower -* gulp -* cordova 6.3.1 -* zipalign -* Android toolchain -* build-tools: -* 25.0.1 -* 24.0.0 -* Android platform: -* 25 -* 23 -* 23 -* Platform tools -* Google Play services - -Use like: -``` -config.vm.box = "henrietta/nodejs5_jdk_adk25" -config.vm.box_url = "http://dev.dms-serwis.com.pl/vagrant/nodejs5_jdk_adk25.box" -``` - -This machine requires a lot of CPU and memory. You can use ones below: -``` -config.vm.provider "virtualbox" do |v| -v.memory = 1260 -v.cpus = 3 -end -``` - - - - - - - ---- - -Usage in Vagrantfile: -``` -config.vm.box = "henrietta/nodejs5_jdk_adk25" -config.vm.box_url = "http://dev.dms-serwis.com.pl/vagrant/nodejs5_jdk_adk25.box" -``` diff --git a/nodejs5_jdk_adk25/build_as_vagrant.sh b/nodejs5_jdk_adk25/build_as_vagrant.sh deleted file mode 100644 index d27561c..0000000 --- a/nodejs5_jdk_adk25/build_as_vagrant.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -cd ~ - -sudo apt-get install -y unzip wget tar - -echo """ -export PATH=\\$PATH:/home/vagrant/platform-tools:/home/vagrant/build-tools/25.0.1:/home/vagrant/tools -export ANDROID_HOME=/home/vagrant -""" >> /home/vagrant/.bashrc -source /home/vagrant/.bashrc - -wynurz node5 && sudo npm install -g --unsafe-perm bower gulp cordova@6.3.1 karma & -wynurz get-adt25 & - -wynurz jdk - -wait %2 - -cd /home/vagrant -echo y | ./tools/bin/sdkmanager "build-tools;25.0.1" "build-tools;24.0.0" "platforms;android-25" "platforms;android-24" "platforms;android-23" "platform-tools" "extras;android;m2repository" "extras;google;m2repository" "extras;google;google_play_services" - -wait %1 -- GitLab