support for new pipeline env

hail-is · Jan 30, 2019 · 154f034 · 154f034
1 parent 1ceeae9
commit 154f034
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/Dockerfile.pr-builder b/Dockerfile.pr-builder
@@ -87,6 +87,7 @@ COPY hail/gradle gradle
 COPY hail/python/hail/dev-environment.yml python/hail/dev-environment.yml
 COPY batch/environment.yml batch/environment.yml
 COPY ci/environment.yml ci/environment.yml
+COPY pipeline/environment.yml pipeline/environment.yml
 
 RUN useradd --create-home --shell /bin/bash hail && \
     usermod -a -G docker hail && \
@@ -101,6 +102,7 @@ RUN ./gradlew downloadDependencies --gradle-user-home /gradle-cache
 RUN conda env create -f ./python/hail/dev-environment.yml && \
     conda env create -f batch/environment.yml && \
     conda env create -f ci/environment.yml && \
+    conda env create -f pipeline/environment.yml && \
     rm -rf /home/hail/.conda/pkgs/*
 
 # gcloud iam key files will be stored here

diff --git a/hail-ci-build-image b/hail-ci-build-image
@@ -1 +1 @@
-gcr.io/hail-vdc/hail-pr-builder:124133f80af4373efd3ea198c63c503821ee965dc40f23041312286a09350571
+gcr.io/hail-vdc/hail-pr-builder:5aae9c62fdc50e2ecf53b30346fe0aa902613822efdc984bb28e009d55a05cc9
diff --git a/pipeline/hail-ci-build.sh b/pipeline/hail-ci-build.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 set -ex
 
+. ../loadconda
+conda activate hail-pipeline
+
 flake8 pipeline
 pylint pipeline --rcfile pipeline/pylintrc --score=n
 pytest test