Pages

added some rules/jobs for pages

.gitlab-ci.yml

@@ -5,12 +5,23 @@ stages:
   - container
   - deploy
 
-compile:
-  stage: build
+.eicweb:
+  rules:
+    - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
   tags:
     - silicon
+
+.not-eicweb:
+  rules:
+    - if: '$CI_SERVER_HOST != "eicweb.phy.anl.gov"'
+
+compile:
+  extends: .eicweb
+  stage: build
   script:
     - bash bin/do_build
+  rules:
+    - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov" && $CI_PIPELINE_SOURCE == "merge_request_event"'
   artifacts:
     when: always
     paths:
@@ -21,29 +32,27 @@ compile:
 docker_image:
   image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
   stage: container
-  tags:
-    - silicon
-  only:
-    - master
-    - ci_dev
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master" && $CI_SERVER_HOST == "eicweb.phy.anl.gov"'
   script:
+    - echo "CI_SERVER_HOST is $CI_SERVER_HOST"
     - cd .containers/docker && make release-latest
 
 docker_tag:
   image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
   stage: container
-  tags:
-    - silicon
-  only:
-    - tags
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG'
   script:
     - cd .containers/docker && make release
 
 pages:
   image: alpine
   stage: build
+  extends: .not-eicweb
   rules:
-    - if: '$CI_SERVER_HOST != "eicweb.phy.anl.gov"'
+    - if: '$CI_SERVER_HOST != "eicweb.phy.anl.gov" && $CI_COMMIT_BRANCH == "master"' 
+    - if: '$CI_SERVER_HOST != "eicweb.phy.anl.gov" && $CI_PIPELINE_SOURCE == "merge_request_event"'
   script:
     - apk update && apk add doxygen  graphviz ttf-ubuntu-font-family
     - cd doc && doxygen Doxyfile && mv doxygen_output/html/ ../public/
@@ -52,7 +61,7 @@ pages:
     - public
 
 staging:
-  only:
-    - master
   stage: deploy
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master"' 
   trigger: EIC/juggler