Fix CI job name conflicts

ci_gcp/gitlab-ci.yaml

@@ -33,7 +33,7 @@ test gcp connection:
         kubectl get all;
       fi
 
-gstest deploy grb:
+gcp deploy grb:
   extends: .gcloud_base
   stage: deploy GRB
   script:
@@ -47,7 +47,7 @@ gstest deploy grb:
   dependencies:
     - get_chart_grb
 
-gs create geotiff storage:
+gcp create geotiff storage:
   extends: .gcloud_base
   stage: create storage
   script:
@@ -63,7 +63,7 @@ gs create geotiff storage:
         - ci_gcp/geotiff-pvc.yaml
     - if: $CREATE_STORAGE
 
-gs create shapefile storage:
+gcp create shapefile storage:
   extends: .gcloud_base
   stage: create storage
   script:
@@ -79,7 +79,7 @@ gs create shapefile storage:
         - ci_gcp/shapefiles-pvc.yaml
     - if: $CREATE_STORAGE
 
-gs deploy rabbit:
+gcp deploy rabbit:
   environment:
     name: geosphere
     url: http://geosphere.ssec.wisc.edu
@@ -99,7 +99,7 @@ gs deploy rabbit:
         - ci_geosphere/values-geosphere-rabbit.yaml
     - if: $DEPLOY_RABBIT
 
-gstest deploy client:
+gcp deploy client:
   extends: .gcloud_base
   stage: deploy Client
   script:

ci_geosphere-test/gitlab-ci.yaml

@@ -52,68 +52,6 @@ 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 mapcache:
   environment:
     name: geosphere-test