Update 2 files

- /helm/orchard/values-stage.yaml
- /.gitlab-ci.yml

.gitlab-ci.yml

@@ -27,25 +27,67 @@ python_tests:
     - cd backend
     - python -m pytest -v || echo "No tests yet"
 
-# deploy_helm_charts:
-#   stage: deploy
-#   image:
-#     name: deps.global.bsf.tools/registry-1.docker.io/alpine/k8s:1.29.12
-#   parallel:
-#     matrix:
-#       # - ENV: "prod"
-#       #   VALUES_FILE: "helm/values-prod.yaml"
-#       #   CONTEXT: "esv/bsf/bsf-services/gitlab-kaas-agent-config:services-prod-agent"
-#       #   NAMESPACE: "bsf-services-namespace"
-#         # ONLY: "main"
-#       - ENV: "dev"
-#         VALUES_FILE: "helm/orchard/values.yaml"
-#         CONTEXT: "esv/bsf/bsf-services/gitlab-kaas-agent-config:services-prod-agent"
-#         NAMESPACE: "bsf-services-dev-namespace"
-#         # ONLY: ["branches", "!main"]
-#   script:
-#     - kubectl config use-context $CONTEXT
-#     - echo "Deploy - buildah push ${IMAGE_NAME}:latest"
-#     - |
-#       helm upgrade --install orchard-dev ./helm/orchard --namespace $NAMESPACE -f $VALUES_FILE
+deploy_helm_charts:
+  stage: deploy
+  image:
+    name: deps.global.bsf.tools/registry-1.docker.io/alpine/k8s:1.29.12
+  parallel:
+    matrix:
+      # - ENV: "prod"
+      #   VALUES_FILE: "helm/values-prod.yaml"
+      #   CONTEXT: "esv/bsf/bsf-services/gitlab-kaas-agent-config:services-prod-agent"
+      #   NAMESPACE: "bsf-services-namespace"
+        # ONLY: "main"
+      - ENV: "dev"
+        VALUES_FILE: "helm/orchard/values.yaml"
+        CONTEXT: "esv/bsf/bsf-services/gitlab-kaas-agent-config:services-prod-agent"
+        NAMESPACE: "bsf-services-dev-namespace"
+        # ONLY: ["branches", "!main"]
+  script:
+    - kubectl config use-context $CONTEXT
+    - echo "Deploy - buildah push ${IMAGE_NAME}:latest"
+    - |
+      helm upgrade --install orchard-dev ./helm/orchard --namespace $NAMESPACE -f $VALUES_FILE
 
+stages:
+  - deploy
+
+.deploy_template: &deploy_template
+  image: deps.global.bsf.tools/registry-1.docker.io/alpine/k8s:1.29.12
+  before_script:
+    - helm version
+    - helm repo add stable https://charts.helm.sh/stable
+    - helm repo add bitnami https://charts.bitnami.com/bitnami
+    - cd helm/orchard
+    - helm dependency update
+    - helm repo update
+  script:
+    - echo "Deploying to $ENV environment in namespace $NAMESPACE using chart $VALUES_FILE with agent $AGENT"
+    - helm upgrade --install orchard-$ENV ./helm/orchard --namespace $NAMESPACE -f $VALUES_FILE --set image.tag=$IMAGE
+  kubernetes:
+    agent: $AGENT
+  environment:
+    name: $ENV
+
+deploy:
+  stage: deploy
+  parallel:
+    matrix:
+      # - ENV: dev
+      #   NAMESPACE: dev
+      #   CHART: ./charts/chart-a
+      #   AGENT: dev-agent
+      - ENV: stage
+        NAMESPACE: orch-stage-namespace
+        VALUES_FILE: "helm/orchard/values-stage.yaml"
+        AGENT: orchard-stage
+        IMAGE: git.linux-amd64-81458b3bcb5ace97109ba4c16f4afa6e55b1b8bd
+  rules:
+    # - if: '$CI_COMMIT_TAG && $CI_JOB_NAME == "deploy (production)"'
+    #   when: always
+    # - if: '$CI_COMMIT_BRANCH == "main" && $CI_JOB_NAME == "deploy (stage)" && $CI_COMMIT_TAG == null'
+    #   when: always
+    - if: '$CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != "main" && $CI_COMMIT_TAG == null && $CI_JOB_NAME == "deploy (stage)"'
+      when: always
+    - when: never
+  <<: *deploy_template