Skip to content

Instantly share code, notes, and snippets.

@linuxsimba
Created November 23, 2016 17:19
Show Gist options
  • Select an option

  • Save linuxsimba/f042e5bf76d098a73ac112238495bbd4 to your computer and use it in GitHub Desktop.

Select an option

Save linuxsimba/f042e5bf76d098a73ac112238495bbd4 to your computer and use it in GitHub Desktop.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..7876150
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,11 @@
+test:2.7:
+ image: python:2.7.12-wheezy
+ script:
+ - netshow-lib/test.sh
+ - netshow/test.sh
+
+test:3.5:
+ image: python:3.4.5-wheezy
+ script:
+ - netshow-lib/test.sh
+ - netshow/test.sh
diff --git a/netshow-lib/test.sh b/netshow-lib/test.sh
index dbc0820..48e3bb4 100755
--- a/netshow-lib/test.sh
+++ b/netshow-lib/test.sh
@@ -12,8 +12,13 @@ git clean -xdf
PATH=$WORKSPACE/venv/bin:/usr/local/bin:$PATH
if [ ! -d "venv" ]; then
- virtualenv venv
+ if [ -a /usr/local/bin/virtualenv ]; then
+ virtualenv venv
+ elif [ -a /usr/local/bin/pyvenv ]; then
+ pyvenv venv
+ fi
fi
+
. venv/bin/activate
pip install --upgrade -r requirements_develop.txt
diff --git a/netshow-lib/tox.ini b/netshow-lib/tox.ini
index 9925e4f..f0e0607 100644
--- a/netshow-lib/tox.ini
+++ b/netshow-lib/tox.ini
@@ -1,6 +1,5 @@
[tox]
skipsdist=True
-envlist = py27,py34
[testenv]
deps=
gitversion
diff --git a/netshow/test.sh b/netshow/test.sh
index 6517257..fdee271 100755
--- a/netshow/test.sh
+++ b/netshow/test.sh
@@ -18,7 +18,11 @@ set -e
echo "starting up"
PATH=$WORKSPACE/venv/bin:/usr/local/bin:$PATH
if [ ! -d "venv" ]; then
- virtualenv venv
+ if [ -a /usr/local/bin/virtualenv ]; then
+ virtualenv venv
+ elif [ -a /usr/local/bin/pyvenv ]; then
+ pyvenv venv
+ fi
fi
. venv/bin/activate
diff --git a/netshow/tox.ini b/netshow/tox.ini
index d884759..a9f6123 100644
--- a/netshow/tox.ini
+++ b/netshow/tox.ini
@@ -1,5 +1,4 @@
[tox]
-envlist = py27,py34
skipsdist = True
[testenv]
deps=
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment