1 files changed, 26 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7792992..457a250 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,31 +1,39 @@
-image: ubuntu:xenial
-before_script:
-  - apt update -qy
-  - apt install -y apt-transport-https
-  - echo "deb https://dl.bintray.com/sbt/debian /" | tee -a /etc/apt/sources.list.d/sbt.list
-  - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823
-  - apt update -qy
-  - apt install -y python3-dev python3-pip python3-wheel libjpeg-dev openjdk-8-jdk-headless sbt
-  - pip3 install pipenv
-  - pipenv --version
+
+image: ubuntu:focal
 
 variables:
   LC_ALL: "C.UTF-8"
   LANG: "C.UTF-8"
+  DEBIAN_FRONTEND: "noninteractive"
+
+before_script:
+  - apt update -qy
+  - apt install -y --no-install-recommends apt-transport-https software-properties-common curl dirmngr gpg-agent
+  # scala-sbt.org APT signing key
+  - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0x2EE0EA64E40A89B84B2DF73499E82A75642AC823
+  - apt-add-repository -y "deb https://repo.scala-sbt.org/scalasbt/debian all main"
+  - apt install -y --no-install-recommends python3-dev python3-pip python3-wheel libjpeg-dev openjdk-8-jdk-headless sbt libpq-dev python-dev python3.8 python3.8-dev python3.8-venv python3.8-distutils pkg-config python3-pytest git libsnappy-dev libsodium-dev libpoppler-cpp-dev cmake libpython3.8-dev build-essential poppler-data libmagic1 pipenv wget
+  - pipenv --version
 
 test_python:
   script:
     - cd python
+    - cp example.env .env
     - pipenv install --dev --deploy
-    - pipenv run pytest --cov
+    - make coverage
+    - make lint
 
 test_python_hadoop:
+  when: manual
   script:
     - cd python_hadoop
     - pipenv install --dev --deploy
     - pipenv run pytest --cov
 
+# needs fixing; some upstream com.hadoop.gplcompression#hadoop-lzo;0.4.16: java.lang.NullPointerException
+# change happened
 test_scalding:
+  when: manual
   script:
     - ./please -h
     - cd scalding
@@ -33,9 +41,10 @@ test_scalding:
     - sbt -mem 1024 assembly
 
 # Needs fixing
-#test_pig:
-#  script:
-#    - ./fetch_hadoop.sh
-#    - cd pig
-#    - pipenv install --dev --deploy
-#    - JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::") pipenv run pytest
+test_pig:
+  when: manual
+  script:
+    - ./fetch_hadoop.sh
+    - cd pig
+    - pipenv install --dev --deploy
+    - JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::") pipenv run pytest