Commit 212d4c81 authored by locallycompact-ct's avatar locallycompact-ct

Update ci to py3 with onbuild docker

parent 0ae60a1b
image: devcurmudgeon/foo
image: python:3.6-onbuild
before_script:
- sh ./install_dependencies.sh
......@@ -24,11 +24,10 @@ check_cache_keys:
YBD_artifact_version: "1"
YBD_mode: "keys-only"
script:
- cd ..
- git clone git://git.baserock.org/baserock/baserock/definitions
- cd definitions
- git checkout baserock-14.40
- ../ybd/ybd.py ci x86_64
- python3 ../ybd.py ci x86_64
- echo ci.b9de86669ce182e60e3f9445e6394b478b67a2c73b4c0764491c158c5f2569e9 > expected.result
- diff expected.result ybd.result
......@@ -38,4 +37,4 @@ check_build:
YBD_check_definitions: "exit"
script:
- git clone git://git.baserock.org/baserock/baserock/definitions
- ./ybd.py definitions/systems/minimal-system-x86_64-generic.morph x86_64
- python3 ./ybd.py definitions/systems/minimal-system-x86_64-generic.morph x86_64
......@@ -32,7 +32,7 @@ installed=false
which apt-get 2>&1 > /dev/null
if [ $? -eq 0 ]; then
$SUDO apt-get -qq update
$SUDO apt-get -qq install build-essential gawk git m4 wget
$SUDO apt-get -qq install build-essential gawk git m4 wget python3
if [ $? -ne 0 ]; then
echo "Install failed"
exit 1
......@@ -43,7 +43,7 @@ fi
# install for fedora
which dnf 2>&1 > /dev/null
if [ $? -eq 0 ] && [ $installed = false ]; then
$SUDO dnf install -y which make automake gcc gcc-c++ gawk git m4 wget python
$SUDO dnf install -y which make automake gcc gcc-c++ gawk git m4 wget python3
if [ $? -ne 0 ]; then
echo "Install failed"
exit 1
......@@ -54,7 +54,7 @@ fi
# install for aws
which yum 2>&1 > /dev/null
if [ $? -eq 0 ] && [ $installed = false ]; then
$SUDO yum install -y which make automake gcc gcc-c++ gawk git m4 wget python
$SUDO yum install -y which make automake gcc gcc-c++ gawk git m4 wget python3
if [ $? -ne 0 ]; then
echo "Install failed"
exit 1
......@@ -65,7 +65,22 @@ fi
# install for Arch
which pacman 2>&1 > /dev/null
if [ $? -eq 0 ] && [ $installed = false ]; then
$SUDO pacman -S --noconfirm which make automake gcc gawk git m4 wget python2
$SUDO pacman -S --noconfirm which make automake gcc gawk git m4 wget python3
if [ $? -ne 0 ]; then
echo "Install failed"
exit 1
fi
installed=true
fi
# install for Alpine
which apk 2>&1 > /dev/null
if [ $? -eq 0 ] && [ $installed = false ]; then
$SUDO apk add --update gcc gawk git m4 wget which make
$SUDO apk --no-cache add ca-certificates
$SUDO wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub
$SUDO wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/glibc-2.23-r3.apk
$SUDO apk add glibc-2.23-r3.apk
if [ $? -ne 0 ]; then
echo "Install failed"
exit 1
......@@ -78,7 +93,7 @@ if [ $installed = false ]; then
exit 1
fi
pip --version 2>&1 > /dev/null
pip3 --version 2>&1 > /dev/null
if [ $? -ne 0 ]; then
wget https://bootstrap.pypa.io/get-pip.py
chmod +x get-pip.py
......@@ -86,6 +101,6 @@ if [ $? -ne 0 ]; then
$SUDO rm get-pip.py
fi
$SUDO pip install fs pyyaml sandboxlib requests
$SUDO pip install jsonschema bottle cherrypy riemann-client
$SUDO pip install pep8
$SUDO pip3 install fs pyyaml sandboxlib requests
$SUDO pip3 install jsonschema bottle cherrypy riemann-client
$SUDO pip3 install pep8
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment