Merge branch 'develop' of https://srccontrol.orr.noaa.gov/gnome/pygnome…

… into develop
NOAA-ORR-ERD · Jun 15, 2021 · cd60e59 · cd60e59
2 parents 1bfdd69 + 880b83e
commit cd60e59
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -54,7 +54,7 @@ compile_pygnome:
       - ./$CI_PIPELINE_ID
       - ./py_gnome/documentation/_build/html
 
-test_pygnome:
+test_pygnome_develop:
   stage: test
   allow_failure: true
   image: registry.orr.noaa.gov/erd/centos-conda/centos7-python3
@@ -65,19 +65,17 @@ test_pygnome:
   tags:
     - docker
 
-build_docs:
-  stage: build
-  before_script:
-    - echo '' # manual override of before_script because we're on runner 12.3 and inherit options are only 12.9+
+test_pygnome_master:
+  stage: test
+  allow_failure: false
+  image: registry.orr.noaa.gov/erd/centos-conda/centos7-python3
   only:
     - master
+    - production
   script:
-    - docker build -f dockerfile-docs ./py_gnome/documentation/_build/html -t registry.orr.noaa.gov/gnome/pygnome/docs
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker push registry.orr.noaa.gov/gnome/pygnome/docs
+    - cd ./py_gnome/tests/unit_tests && pytest
   tags:
-    - shell
-    - build
+    - docker
 
 develop:
   stage: build
@@ -98,11 +96,17 @@ develop:
 
 master:
   stage: build
+  before_script:
+    - echo ''
   script:
+    - docker build -f dockerfile-docs ./py_gnome/documentation/_build/html -t registry.orr.noaa.gov/gnome/pygnome/docs
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker push registry.orr.noaa.gov/gnome/pygnome/docs
+
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker pull registry.orr.noaa.gov/gnome/oillibrary:master
     - docker tag registry.orr.noaa.gov/gnome/oillibrary:master oillibrary
-    - docker build -f dockerfile . -t registry.orr.noaa.gov/gnome/pygnome:master
+    - docker build . -t registry.orr.noaa.gov/gnome/pygnome:master
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker push registry.orr.noaa.gov/gnome/pygnome:master
   only:
@@ -112,12 +116,18 @@ master:
      - build
 
 production:
+  before_script:
+    - echo ''
   stage: build
   script:
+    - docker build -f dockerfile-docs ./py_gnome/documentation/_build/html -t registry.orr.noaa.gov/gnome/pygnome/docs
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker push registry.orr.noaa.gov/gnome/pygnome/docs
+
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker pull registry.orr.noaa.gov/gnome/oillibrary:production
     - docker tag registry.orr.noaa.gov/gnome/oillibrary:production oillibrary
-    - docker build -f dockerfile . -t registry.orr.noaa.gov/gnome/pygnome:production
+    - docker build . -t registry.orr.noaa.gov/gnome/pygnome:production
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker push registry.orr.noaa.gov/gnome/pygnome:production
   only:

diff --git a/dockerfile b/dockerfile
@@ -7,6 +7,6 @@ RUN yum install -y wget gcc make bzip2 gcc-c++ ca-certificates \
 COPY ./ /pygnome/
 
 RUN cd pygnome && conda install --file conda_requirements.txt
-RUN cd pygnome/py_gnome && python setup.py develop
+RUN cd pygnome/py_gnome && python setup.py install
 
 RUN cd pygnome/py_gnome/documentation && make html