Fix pull-cache, split tokens

.gitignore

@@ -15,7 +15,7 @@ __pycache__
 .coverage
 .coverage.*
 codeship.aes
-tokens
+*-tokens
 moldesign/_static_data/components.ci*
 moldesign/_static_data/aa-variants-v1.ci*
 tmp

codeship-services.yml

@@ -1,4 +1,4 @@
-image_builder:
+image_builder: &build-base
   build:
     context: .
     dockerfile: ./deployment/build-env.dockerfile
@@ -9,9 +9,14 @@ image_builder:
   working_dir: /opt/molecular-design-toolkit
 
 
+publisher:
+   <<: *build-base
+   encrypted_env_file: ./deployment/deploy-tokens.crypt
+
+
 test_moldesign_minimal: &test-base
   working_dir: /opt/molecular-design-toolkit/
-  encrypted_env_file: ./deployment/tokens.crypt
+  encrypted_env_file: ./deployment/test-tokens.crypt
   add_docker: true
   volumes:
     - ./tmp/reports:/opt/reports
@@ -60,6 +65,3 @@ test_moldesign_complete_py2:
     TESTENV: complete
     PYVERSION: 2
     OPENMM_CPU_THREADS: 1
-
-publisher:
-   <<: *test-base

codeship-steps.yml

@@ -28,7 +28,7 @@
          --cache-repo moldesign --cache-tag cache
 
 - name: push-images
-  service: image_builder
+  service: publisher
   command: deployment/push.sh
 
 - name: print-environments

deployment/deploy-tokens.crypt

@@ -0,0 +1 @@
+X8Mv+rxehVeyD9IN6UuWwFWe69Hl3g1qyILvxDnMx4JxDuYYA3097eXKuJCSP4tbgHr+d3c4dKTF0fNGma36mBqlcAl23Ez5KytrkBKuQo/CWYQNY9SQpKTykyyWSqAIbZS/8N1wMWYxYVyJqfVe6fukcQ07oSBhJx1W4F+e

deployment/pull-cache.sh

@@ -1,10 +1,5 @@
 #!/usr/bin/env bash
 
-if [ -z ${chemdocker_tag} ]; then
-  echo "\$chemdocker_tag" var not set.
-  exit 10
-fi
-
 if [ -z ${CI_BRANCH} ]; then
   echo "\$CI_BRANCH" var not set.
   exit 10
@@ -32,6 +27,7 @@ function run-pull(){
 }
 
 # we copy binaries out of this one for our build
+chemdocker_tag=$(cat /opt/molecular-design-toolkit/moldesign/compute/CHEMDOCKER_TAG)
 echocmd docker pull chemdocker/pyscf-build-1.3.1:${chemdocker_tag} | tee -a pull.log | egrep -i 'pull|already';
 
 for img in moldesign_minimal       \

deployment/run-ci-tests.sh

@@ -6,7 +6,7 @@ install_location=$(python -c "import moldesign, os; print(moldesign.__path__[0])
 test_location=$(dirname "${install_location}")
 
 VERSION="${TESTENV}.py${PYVERSION}"
-PYTESTFLAGS="moldesign/_tests/ -n 3 --spec  --durations=20 --junit-xml=/opt/reports/junit.${VERSION}.xml --timeout=3600 --tb=short"
+PYTESTFLAGS="moldesign/_tests/ -n 2 --spec  --durations=20 --junit-xml=/opt/reports/junit.${VERSION}.xml --timeout=3600 --tb=short"
 if [ "${VERSION}" == "complete.py3" ]; then
        PYTESTFLAGS="${PYTESTFLAGS} --cov moldesign --cov-config /opt/molecular-design-toolkit/.coveragerc"
 fi

deployment/test-tokens.crypt

@@ -0,0 +1 @@
+e9lHjc+H2LI0jOEIP46S79qQ0zHBFvwtazKyStBSxHzr2sdUi9Vqxum+8BqBOYQYVufh/0J2LJcIelbXUZQuCdybgVJ9X4jzBtq4lpJsrPatDS+GZ905nJmrSs0fesUWs/wme5DTteqUibIXgYOwH48l+LH7W33h8W4zeXa9833+Pw==