Merge pull request #619 from galasa-dev/simbank-updates

Simbank updates
galasa-dev · Sep 27, 2024 · fd8a908 · fd8a908
2 parents bc62af1 + 2631acc
commit fd8a908
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 68 deletions.
diff --git a/infrastructure/cicsk8s/galasa-prod/galasa-prod/simbank.yaml b/infrastructure/cicsk8s/galasa-prod/galasa-prod/simbank.yaml
@@ -27,7 +27,7 @@ spec:
         applevel: critical
       containers:
       - name: simbank
-        image: harbor.galasa.dev/galasadev/galasa-simplatform-amd64:main
+        image: ghcr.io/galasa-dev/simplatform-jar:main
         imagePullPolicy: Always
         command: ["java"]
         args: 

diff --git a/infrastructure/galasa-plan-b-lon02/argo-app-create.sh b/infrastructure/galasa-plan-b-lon02/argo-app-create.sh
@@ -135,8 +135,6 @@ function delete_application {
 # delete_application "main-bld"
 # delete_application "main-inttests"
 # delete_application "main-simplatform"
-# delete_application "prod-simplatform"
-# delete_application "prod-maven-repos"
 # delete_application "galasa-development-namespace"
 delete_application "galasa-ecosystem1"
 create_application "galasa-ecosystem1" \
@@ -186,10 +184,6 @@ create_application "galasa-ecosystem1" \
 #     "galasa-development/simplatform" \
 #     "values-used-by-different-argo-apps/main-simplatform-values.yaml"
 
-# create_helm_application "prod-simplatform" \
-#     "galasa-development/simplatform" \
-#     "values-used-by-different-argo-apps/prod-simplatform-values.yaml"
-
 # create_helm_application "prod-maven-repos" \
 #     "galasa-development/branch-maven-repository" \
 #     "values-used-by-different-argo-apps/prod-maven-repos.yaml"

diff --git a/...a-development/simplatform/values-used-by-different-argo-apps/main-simplatform-values.yaml b/...a-development/simplatform/values-used-by-different-argo-apps/main-simplatform-values.yaml
@@ -6,5 +6,5 @@
 
 namespace: galasa-development
 branch: main
-imageName: harbor.galasa.dev/galasadev/galasa-simplatform
+imageName: ghcr.io/galasa-dev/simplatform-maven-artefacts
 imageTag: main
diff --git a/...a-development/simplatform/values-used-by-different-argo-apps/prod-simplatform-values.yaml b/...a-development/simplatform/values-used-by-different-argo-apps/prod-simplatform-values.yaml
diff --git a/infrastructure/galasa-plan-b-lon02/galasa-development/simplatform/values.yaml b/infrastructure/galasa-plan-b-lon02/galasa-development/simplatform/values.yaml
@@ -6,5 +6,5 @@
 
 namespace: galasa-development
 branch: main
-imageName: harbor.galasa.dev/galasadev/galasa-simplatform
+imageName: ghcr.io/galasa-dev/simplatform-maven-artefacts
 imageTag: main
diff --git a/releasePipeline/02-create-argocd-apps.sh b/releasePipeline/02-create-argocd-apps.sh
@@ -109,7 +109,7 @@ function create_simplatform {
                     --dest-server https://kubernetes.default.svc \
                     --dest-namespace galasa-development \
                     --helm-set branch=${release_type} \
-                    --helm-set imageTag=main
+                    --helm-set imageTag=${release_type}
 }
 
 # checks if it's been called by 01-run-pre-release.sh, if it isn't run all functions

diff --git a/releasePipeline/argocd-synced/pipelines/branch-create-galasa.yaml b/releasePipeline/argocd-synced/pipelines/branch-create-galasa.yaml
@@ -336,4 +336,28 @@ spec:
         - $(params.overwrite)
         - $(params.force)
         - --credentials
+        - /creds/githubcreds.yaml
+# 
+# 
+# 
+  - name: clone-branch-simplatform
+    taskRef: 
+      name: galasabld
+    params:
+    - name: context
+      value: $(context.pipelineRun.name)
+    - name: command
+      value:
+        - github
+        - branch
+        - copy
+        - --repository
+        - simplatform
+        - --to
+        - $(params.distBranch)
+        - --branch
+        - $(params.fromBranch)
+        - $(params.overwrite)
+        - $(params.force)
+        - --credentials
         - /creds/githubcreds.yaml
diff --git a/releasePipeline/argocd-synced/pipelines/branch-delete-all.yaml b/releasePipeline/argocd-synced/pipelines/branch-delete-all.yaml
@@ -279,3 +279,23 @@ spec:
         - $(params.distBranch)
         - --credentials
         - /creds/githubcreds.yaml
+# 
+####### Simplatform
+# 
+  - name: delete-branch-simplatform
+    taskRef:
+      name: galasabld
+    params:
+    - name: context
+      value: $(context.pipelineRun.name)
+    - name: command
+      value: 
+        - github
+        - branch
+        - delete
+        - --repository
+        - simplatform
+        - --branch
+        - $(params.distBranch)
+        - --credentials
+        - /creds/githubcreds.yaml
diff --git a/releasePipeline/argocd-synced/pipelines/branch-tag-galasa.yaml b/releasePipeline/argocd-synced/pipelines/branch-tag-galasa.yaml
@@ -299,3 +299,23 @@ spec:
         - $(params.tag)
         - --credentials
         - /creds/githubcreds.yaml
+
+  - name: tag-branch-simplatform
+    taskRef:
+      name: galasabld
+    params:
+    - name: context
+      value: $(context.pipelineRun.name)
+    - name: command
+      value:
+        - github
+        - branch
+        - tag
+        - --repository
+        - simplatform
+        - --branch
+        - $(params.distBranch)
+        - --tag
+        - $(params.tag)
+        - --credentials
+        - /creds/githubcreds.yaml
diff --git a/releasePipeline/argocd-synced/tasks/deploy-maven-galasa.yaml b/releasePipeline/argocd-synced/tasks/deploy-maven-galasa.yaml