From 9a2045c3973243805e2941a25fee561c3f33a2b5 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Thu, 13 Aug 2020 20:10:27 -0500
Subject: [PATCH] Switch to only having a test mapcache

---
 .gitlab-ci.yml                         |   3 +
 ci_geosphere-test/gitlab-ci.yaml       | 164 ++++++++++++-------------
 ci_geosphere-test/values-mapcache.yaml |   6 +-
 ci_geosphere/values-mapserver.yaml     |   3 +
 4 files changed, 91 insertions(+), 85 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 334fad0..54a5b67 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,6 +39,9 @@ build ci:
     # no need to build if another project triggered us
     - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never
+    # no need to build with tags or non-master...probably
+    - if: '$CI_COMMIT_BRANCH != "master"'
+      when: never
     - changes:
         - cichart/Dockerfile
       when: always
diff --git a/ci_geosphere-test/gitlab-ci.yaml b/ci_geosphere-test/gitlab-ci.yaml
index 10ba785..aef04f2 100644
--- a/ci_geosphere-test/gitlab-ci.yaml
+++ b/ci_geosphere-test/gitlab-ci.yaml
@@ -10,27 +10,27 @@
 #   Create TLS certificate secret:
 #     kubectl create -n geosphere-test secret tls geosphere-tls-certs --cert=geosphere_ssec_wisc_edu.crt --key=geosphere_ssec_wisc_edu.key
 
-gstest create shapefile storage:
-  extends: .helm_based_job
-  stage: create storage
-  script:
-    - echo "$CI_COMMIT_BRANCH"
-    - echo "$CI_COMMIT_TAG"
-    - ns=$(./helpers/get_namespace.sh)
-    # copy secret kubeconfig to the mounted (pwd) directory
-    - cp $kubekorner_k3s_config .
-    - kubeconfig=$(basename $kubekorner_k3s_config)
-    - ./helpers/create_pvc.sh "$ns" "ci_geosphere-test/shapefiles-pvc.yaml" "geosphere-tile-gen-shapefiles" "$kubeconfig"
-  # this job doesn't actually need any artifacts from previous jobs
-  dependencies: []
-  rules:
-    - if: '$CI_COMMIT_BRANCH != "master"'
-      when: never
-    - if: '$kubekorner_k3s_config == null'
-      when: never
-    - changes:
-        - ci_geosphere-test/shapefiles-pvc.yaml
-    - if: $CREATE_STORAGE
+#gstest create shapefile storage:
+#  extends: .helm_based_job
+#  stage: create storage
+#  script:
+#    - echo "$CI_COMMIT_BRANCH"
+#    - echo "$CI_COMMIT_TAG"
+#    - ns=$(./helpers/get_namespace.sh)
+#    # copy secret kubeconfig to the mounted (pwd) directory
+#    - cp $kubekorner_k3s_config .
+#    - kubeconfig=$(basename $kubekorner_k3s_config)
+#    - ./helpers/create_pvc.sh "$ns" "ci_geosphere-test/shapefiles-pvc.yaml" "geosphere-tile-gen-shapefiles" "$kubeconfig"
+#  # this job doesn't actually need any artifacts from previous jobs
+#  dependencies: []
+#  rules:
+#    - if: '$CI_COMMIT_BRANCH != "master"'
+#      when: never
+#    - if: '$kubekorner_k3s_config == null'
+#      when: never
+#    - changes:
+#        - ci_geosphere-test/shapefiles-pvc.yaml
+#    - if: $CREATE_STORAGE
 
 gstest deploy rabbit:
   environment:
@@ -58,67 +58,67 @@ gstest deploy rabbit:
         - ci_geosphere-test/values-geosphere-rabbit.yaml
     - if: $DEPLOY_RABBIT
 
-gstest deploy tile gen g16 radf:
-  extends: .deploy_tile_gen
-  variables:
-    VALUES_DIR: "ci_geosphere-test"
-    DEPLOY_SUFFIX: "-g16-radf"
-  rules:
-    - if: '$CI_COMMIT_BRANCH != "master"'
-      when: never
-    - if: '$kubekorner_k3s_config == null'
-      when: never
-    - when: on_success
-
-gstest deploy tile gen g16 radc:
-  extends: .deploy_tile_gen
-  variables:
-    VALUES_DIR: "ci_geosphere-test"
-    DEPLOY_SUFFIX: "-g16-radc"
-  rules:
-    - if: '$CI_COMMIT_BRANCH != "master"'
-      when: never
-    - if: '$kubekorner_k3s_config == null'
-      when: never
-    - when: on_success
-
-gstest deploy tile gen g16 radm1:
-  extends: .deploy_tile_gen
-  variables:
-    VALUES_DIR: "ci_geosphere-test"
-    DEPLOY_SUFFIX: "-g16-radm1"
-  rules:
-    - if: '$CI_COMMIT_BRANCH != "master"'
-      when: never
-    - if: '$kubekorner_k3s_config == null'
-      when: never
-    - when: on_success
-
-gstest deploy tile gen g16 radm2:
-  extends: .deploy_tile_gen
-  variables:
-    VALUES_DIR: "ci_geosphere-test"
-    DEPLOY_SUFFIX: "-g16-radm2"
-  rules:
-    - if: '$CI_COMMIT_BRANCH != "master"'
-      when: never
-    - if: '$kubekorner_k3s_config == null'
-      when: never
-    - when: on_success
-
-gstest deploy mapserver:
-  environment:
-    name: geosphere-test
-    url: http://geosphere-test.ssec.wisc.edu
-  variables:
-    VALUES_DIR: "ci_geosphere-test"
-  extends: .deploy_mapserver
-  rules:
-    - if: '$CI_COMMIT_BRANCH != "master"'
-      when: never
-    - if: '$kubekorner_k3s_config == null'
-      when: never
-    - when: on_success
+#gstest deploy tile gen g16 radf:
+#  extends: .deploy_tile_gen
+#  variables:
+#    VALUES_DIR: "ci_geosphere-test"
+#    DEPLOY_SUFFIX: "-g16-radf"
+#  rules:
+#    - if: '$CI_COMMIT_BRANCH != "master"'
+#      when: never
+#    - if: '$kubekorner_k3s_config == null'
+#      when: never
+#    - when: on_success
+#
+#gstest deploy tile gen g16 radc:
+#  extends: .deploy_tile_gen
+#  variables:
+#    VALUES_DIR: "ci_geosphere-test"
+#    DEPLOY_SUFFIX: "-g16-radc"
+#  rules:
+#    - if: '$CI_COMMIT_BRANCH != "master"'
+#      when: never
+#    - if: '$kubekorner_k3s_config == null'
+#      when: never
+#    - when: on_success
+#
+#gstest deploy tile gen g16 radm1:
+#  extends: .deploy_tile_gen
+#  variables:
+#    VALUES_DIR: "ci_geosphere-test"
+#    DEPLOY_SUFFIX: "-g16-radm1"
+#  rules:
+#    - if: '$CI_COMMIT_BRANCH != "master"'
+#      when: never
+#    - if: '$kubekorner_k3s_config == null'
+#      when: never
+#    - when: on_success
+#
+#gstest deploy tile gen g16 radm2:
+#  extends: .deploy_tile_gen
+#  variables:
+#    VALUES_DIR: "ci_geosphere-test"
+#    DEPLOY_SUFFIX: "-g16-radm2"
+#  rules:
+#    - if: '$CI_COMMIT_BRANCH != "master"'
+#      when: never
+#    - if: '$kubekorner_k3s_config == null'
+#      when: never
+#    - when: on_success
+#
+#gstest deploy mapserver:
+#  environment:
+#    name: geosphere-test
+#    url: http://geosphere-test.ssec.wisc.edu
+#  variables:
+#    VALUES_DIR: "ci_geosphere-test"
+#  extends: .deploy_mapserver
+#  rules:
+#    - if: '$CI_COMMIT_BRANCH != "master"'
+#      when: never
+#    - if: '$kubekorner_k3s_config == null'
+#      when: never
+#    - when: on_success
 
 gstest deploy mapcache:
   environment:
diff --git a/ci_geosphere-test/values-mapcache.yaml b/ci_geosphere-test/values-mapcache.yaml
index 9174ab6..d110a61 100644
--- a/ci_geosphere-test/values-mapcache.yaml
+++ b/ci_geosphere-test/values-mapcache.yaml
@@ -1,10 +1,10 @@
 rabbitIn:
-  host: "geosphere-rabbit-rabbitmq"
+  host: "geosphere-rabbit-rabbitmq.geosphere"
   username: "user"
-  passwordSecret: "geosphere-rabbit-rabbitmq"
+  passwordSecret: "geosphere-rabbit-rabbitmq-production"
   topic: "data.goes.g16.abi.*.l1b.tiles.*.complete"
 wms:
-  host: "geosphere-mapserver"
+  host: "geosphere-mapserver.geosphere"
 cache:
   persistence:
     enabled: true
diff --git a/ci_geosphere/values-mapserver.yaml b/ci_geosphere/values-mapserver.yaml
index 0b26288..0b46848 100644
--- a/ci_geosphere/values-mapserver.yaml
+++ b/ci_geosphere/values-mapserver.yaml
@@ -10,6 +10,9 @@ ingress:
   hosts:
     - host: geosphere.ssec.wisc.edu
       paths: ["/wms", "/wms_times"]
+    # the test site uses the production WMS server
+    - host: geosphere-test.ssec.wisc.edu
+      paths: ["/wms", "/wms_times"]
   tls:
     - hosts:
         - "geosphere.ssec.wisc.edu"
-- 
GitLab