Switch to rules basic filtering on CI

.gitlab-ci.yml

-build_metobs_test_site:
+basic_build_check:
+  tags:
+    - development
+  script:
+    - source /var/lib/gitlab-runner/.bashrc
+    - conda activate rain_site
+    - make clean
+    - make publish
+    - echo $PWD
+  rules:
+    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"'
+      when: always
+    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+      when: always
+
+build_upload_metobs_test_site:
   tags:
     - workstation
     - development
@@ -8,13 +23,13 @@ build_metobs_test_site:
     - make clean
     - make publish
     - chmod 600 "$METOBS_UPLOAD_TEST"
-    - rsync --delete -auv -e "ssh -vvv -T -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -o ForwardAgent=no -F /dev/null -i $METOBS_UPLOAD_TEST" output/ davidh@webaccess:METOBS_TEST
-  only:
-    - develop
-    - feature-automated-build
-build_metobs_prod_site:
+    - rsync --delete -auv -e "ssh -T -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -o ForwardAgent=no -F /dev/null -i $METOBS_UPLOAD_TEST" output/ davidh@webaccess:METOBS_TEST
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "develop"'
+      when: always
+
+build_upload_metobs_prod_site:
   tags:
-    - workstation
     - production
   script:
     - source /var/lib/gitlab-runner/.bashrc
@@ -22,6 +37,7 @@ build_metobs_prod_site:
     - make clean
     - make publish
     - chmod 600 "$METOBS_UPLOAD_PROD"
-    - rsync --delete -auv -e "ssh -T -o IdentitiesOnly=yes -o ForwardAgent=no -F /dev/null -i $METOBS_UPLOAD_PROD" output/ davidh@webaccess:METOBS_PROD
-  only:
-    - master
+    - rsync --delete -auv -e "ssh -T -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -o ForwardAgent=no -F /dev/null -i $METOBS_UPLOAD_PROD" output/ davidh@webaccess:METOBS_PROD
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master"'
+      when: always