diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4bb867d0..25bbebde 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ --- # Author: Clayton Craft -image: python:3.7-slim-stretch +image: alpine:latest cache: paths: @@ -12,7 +12,7 @@ before_script: # venv created in CI_PROJECT_DIR for caching - "[[ ! -d venv ]] && virtualenv venv -p $(which python3)" - "source venv/bin/activate" - - "pip3 install pytest-cov python-coveralls pytest" + - "apk -q add py3-pytest-cov py3-coveralls py3-pytest" - "python3 --version" - "su pmos -c 'git config --global user.email postmarketos-ci@localhost' || true" - "su pmos -c 'git config --global user.name postmarketOS_CI' || true" diff --git a/.gitlab/setup-pmos-environment.sh b/.gitlab/setup-pmos-environment.sh index 4958060c..080ba428 100755 --- a/.gitlab/setup-pmos-environment.sh +++ b/.gitlab/setup-pmos-environment.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # This script is meant for the gitlab CI shared runners, not for # any specific runners. Specific runners are expected to provide @@ -6,18 +6,17 @@ # Author: Clayton Craft # skip non-shared runner -[[ -d "/home/pmos" ]] && echo "pmos user already exists, assume running on pre-configured runner" && exit +[ -d "/home/pmos" ] && echo "pmos user already exists, assume running on pre-configured runner" && exit # mount binfmt_misc mount -t binfmt_misc none /proc/sys/fs/binfmt_misc # install dependencies (procps: /bin/kill) -apt update -apt install -q -y git sudo procps python3-pip -pip3 install virtualenv +apk update +apk -q add git sudo bash openssl procps py3-virtualenv # create pmos user echo "Creating pmos user" -useradd pmos -m -s /bin/bash -b "/home" +adduser -s /bin/sh -h /home/pmos pmos chown -R pmos:pmos . echo 'pmos ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers