From a2511cc7750aecf41a05a8704bfee869785f1d10 Mon Sep 17 00:00:00 2001
From: Piotr Maslanka <piotr.maslanka@henrietta.com.pl>
Date: Sat, 25 Mar 2017 12:48:49 +0100
Subject: [PATCH] meta
---
.gitattributes | 1 +
.gitlab-ci.yml | 11 -----------
cass_zk_rmq/build.sh | 4 ++--
cassandra/build.sh | 4 ++--
czr_pythons/build.sh | 8 ++++----
czr_pythons_pg/build.sh | 6 +++---
make.py | 5 +++++
nodejs4/build.sh | 2 +-
nodejs5_jdk_adk25/build_as_vagrant.sh | 4 ++--
run.sh | 3 +++
wynurz.sh | 4 ++--
11 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/.gitattributes b/.gitattributes
index c0631c0..c311834 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
wynurz.sh eol=lf
+run.sh eol=lf
*/build.sh eol=lf
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c439b22..f4f90fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
deploy_cassandra:
- when: manual
stage: deploy
tags:
- vagrant
@@ -28,7 +27,6 @@ build_cassandra:
- cd ..
deploy_cass_zk_rmq:
- when: manual
stage: deploy
tags:
- vagrant
@@ -37,7 +35,6 @@ deploy_cass_zk_rmq:
- 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:
- when: manual
stage: build
tags:
- vagrant
@@ -57,7 +54,6 @@ build_cass_zk_rmq:
- cd ..
deploy_czr_pythons:
- when: manual
stage: deploy
tags:
- vagrant
@@ -66,7 +62,6 @@ deploy_czr_pythons:
- vagrant box remove henrietta//czr_pythons
- vagrant box add henrietta//czr_pythons file:///var/www/html/dev/vagrant/czr_pythons.box
build_czr_pythons:
- when: manual
stage: build
tags:
- vagrant
@@ -86,7 +81,6 @@ build_czr_pythons:
- cd ..
deploy_czr_pythons_pg:
- when: manual
stage: deploy
tags:
- vagrant
@@ -95,7 +89,6 @@ deploy_czr_pythons_pg:
- 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:
- when: manual
stage: build
tags:
- vagrant
@@ -115,7 +108,6 @@ build_czr_pythons_pg:
- cd ..
deploy_nodejs4:
- when: manual
stage: deploy
tags:
- vagrant
@@ -124,7 +116,6 @@ deploy_nodejs4:
- vagrant box remove henrietta//nodejs4
- vagrant box add henrietta//nodejs4 file:///var/www/html/dev/vagrant/nodejs4.box
build_nodejs4:
- when: manual
stage: build
tags:
- vagrant
@@ -144,7 +135,6 @@ build_nodejs4:
- cd ..
deploy_nodejs5_jdk_adk25:
- when: manual
stage: deploy
tags:
- vagrant
@@ -153,7 +143,6 @@ deploy_nodejs5_jdk_adk25:
- 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:
- when: manual
stage: build
tags:
- vagrant
diff --git a/cass_zk_rmq/build.sh b/cass_zk_rmq/build.sh
index c5749e9..977ca7a 100644
--- a/cass_zk_rmq/build.sh
+++ b/cass_zk_rmq/build.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
bash boxen/cassandra/build.sh
-bash wynurz.sh zookeeeper
-bash wynurz.sh rabbitmq
+wynurz.sh zookeeeper
+wynurz.sh rabbitmq
diff --git a/cassandra/build.sh b/cassandra/build.sh
index 06fc364..99f5e0b 100644
--- a/cassandra/build.sh
+++ b/cassandra/build.sh
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
-bash wynurz.sh java
-bash wynurz.sh cassandra
\ No newline at end of file
+wynurz.sh java
+wynurz.sh cassandra
\ No newline at end of file
diff --git a/czr_pythons/build.sh b/czr_pythons/build.sh
index 12f90e7..fc97057 100644
--- a/czr_pythons/build.sh
+++ b/czr_pythons/build.sh
@@ -5,9 +5,9 @@ pip install --upgrade setuptools==5.5.1
# Install RabbitMQ
-$(bash wynurz.sh java &&
-bash wynurz.sh cassandra &&
-bash wynurz.sh rabbitmq &&
-bash wynurz.sh zookeeper) &
+$(wynurz.sh java &&
+wynurz.sh cassandra &&
+wynurz.sh rabbitmq &&
+wynurz.sh zookeeper) &
pip install cassandra-driver kazoo CoolAMQP requests futures six monotonic nose mock
diff --git a/czr_pythons_pg/build.sh b/czr_pythons_pg/build.sh
index 6e91c75..9e59eea 100644
--- a/czr_pythons_pg/build.sh
+++ b/czr_pythons_pg/build.sh
@@ -6,8 +6,8 @@ pip install --upgrade cffi
bash boxen/cassandra/build.sh
-bash wynurz.sh zookeeeper
-bash wynurz.sh rabbitmq
-bash wynurz.sh postgresql
+wynurz.sh zookeeeper
+wynurz.sh rabbitmq
+wynurz.sh 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 354f04d..da59fd1 100644
--- a/make.py
+++ b/make.py
@@ -17,6 +17,11 @@ if __name__ == '__main__':
with open('.gitlab-ci.yml', 'wb') as ci:
for box in boxes:
+ try:
+ os.unlink(os.path.join(box, 'metadata.json'))
+ except OSError:
+ pass
+
ci.write('''
deploy_$BOX:
stage: deploy
diff --git a/nodejs4/build.sh b/nodejs4/build.sh
index dbd2351..68807ff 100644
--- a/nodejs4/build.sh
+++ b/nodejs4/build.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-bash wynurz.sh node4
+wynurz.sh node4
npm cache clean
npm install -g --unsafe-perm bower gulp
diff --git a/nodejs5_jdk_adk25/build_as_vagrant.sh b/nodejs5_jdk_adk25/build_as_vagrant.sh
index 5fa6e8e..963ff88 100644
--- a/nodejs5_jdk_adk25/build_as_vagrant.sh
+++ b/nodejs5_jdk_adk25/build_as_vagrant.sh
@@ -10,14 +10,14 @@ export ANDROID_HOME=/home/vagrant
""" >> /home/vagrant/.bashrc
source /home/vagrant/.bashrc
-(bash wynurz.sh node5 &&
+(wynurz.sh node5 &&
npm install -g --unsafe-perm bower gulp cordova@6.3.1 karma) &
(wget -nv http://dev.dms-serwis.com.pl/misc/tools_r25.2.3-linux.zip &&
unzip tools_r25.2.3-linux.zip &&
rm -f tools_r25.2.3-linux.zip) &
-bash wynurz.sh jdk
+wynurz.sh jdk
wait %2
diff --git a/run.sh b/run.sh
index 9b2bc6d..fee1285 100644
--- a/run.sh
+++ b/run.sh
@@ -2,6 +2,9 @@
shutdown -h +30 "Timeout on VM creation"
+export PATH=$PATH:/vagrant
+chmod ugo+x /vagrant/*.sh
+
if [ ! -e "/vagrant/build.sh" ]; then
sudo -H -u vagrant bash /vagrant/build_as_vagrant.sh
else
diff --git a/wynurz.sh b/wynurz.sh
index c078d12..eb097da 100644
--- a/wynurz.sh
+++ b/wynurz.sh
@@ -13,8 +13,8 @@ fi
if [ $1 == "javacass" ]; then
- bash wynurz.sh java
- bash wynurz.sh cassandra
+ wynurz.sh java
+ wynurz.sh cassandra
fi
if [ $1 == "node4" ]; then
--
GitLab