From 89c1c893ca7cb53d6f8440b383568a4f916f8255 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 27 Sep 2024 14:25:11 +0100 Subject: [PATCH 1/5] Update simbank app to use GHCR images Signed-off-by: Jade Carino --- infrastructure/cicsk8s/galasa-prod/galasa-prod/simbank.yaml | 2 +- .../main-simplatform-values.yaml | 2 +- .../galasa-development/simplatform/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infrastructure/cicsk8s/galasa-prod/galasa-prod/simbank.yaml b/infrastructure/cicsk8s/galasa-prod/galasa-prod/simbank.yaml index c38f53cb..ec10a6b8 100644 --- 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/galasa-development/simplatform/values-used-by-different-argo-apps/main-simplatform-values.yaml b/infrastructure/galasa-plan-b-lon02/galasa-development/simplatform/values-used-by-different-argo-apps/main-simplatform-values.yaml index a0d79b07..88284090 100644 --- a/infrastructure/galasa-plan-b-lon02/galasa-development/simplatform/values-used-by-different-argo-apps/main-simplatform-values.yaml +++ b/infrastructure/galasa-plan-b-lon02/galasa-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 \ No newline at end of file diff --git a/infrastructure/galasa-plan-b-lon02/galasa-development/simplatform/values.yaml b/infrastructure/galasa-plan-b-lon02/galasa-development/simplatform/values.yaml index a0d79b07..88284090 100644 --- 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 \ No newline at end of file From d705044704605e81e98659734a417a73648c4ea3 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 27 Sep 2024 14:25:33 +0100 Subject: [PATCH 2/5] delete prod-simplatform values, not needed Signed-off-by: Jade Carino --- .../prod-simplatform-values.yaml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 infrastructure/galasa-plan-b-lon02/galasa-development/simplatform/values-used-by-different-argo-apps/prod-simplatform-values.yaml diff --git a/infrastructure/galasa-plan-b-lon02/galasa-development/simplatform/values-used-by-different-argo-apps/prod-simplatform-values.yaml b/infrastructure/galasa-plan-b-lon02/galasa-development/simplatform/values-used-by-different-argo-apps/prod-simplatform-values.yaml deleted file mode 100644 index e237db49..00000000 --- a/infrastructure/galasa-plan-b-lon02/galasa-development/simplatform/values-used-by-different-argo-apps/prod-simplatform-values.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright contributors to the Galasa project -# -# SPDX-License-Identifier: EPL-2.0 -# - -namespace: galasa-development -branch: prod -imageName: harbor.galasa.dev/galasadev/galasa-simplatform -imageTag: prod \ No newline at end of file From c4b2d492fa108b48f311f39bf037cb2c03484460 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 27 Sep 2024 14:31:49 +0100 Subject: [PATCH 3/5] delete prod-simplatform from script, not needed Signed-off-by: Jade Carino --- infrastructure/galasa-plan-b-lon02/argo-app-create.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/infrastructure/galasa-plan-b-lon02/argo-app-create.sh b/infrastructure/galasa-plan-b-lon02/argo-app-create.sh index d2c2f4a4..08290022 100755 --- 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" From 1648fc6fce28cc3629ac33400b2fec1359787d1b Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 27 Sep 2024 14:32:13 +0100 Subject: [PATCH 4/5] add simplatform into release process Signed-off-by: Jade Carino --- releasePipeline/02-create-argocd-apps.sh | 2 +- .../pipelines/branch-create-galasa.yaml | 24 +++++++++++++++++++ .../pipelines/branch-delete-all.yaml | 20 ++++++++++++++++ .../pipelines/branch-tag-galasa.yaml | 20 ++++++++++++++++ 4 files changed, 65 insertions(+), 1 deletion(-) diff --git a/releasePipeline/02-create-argocd-apps.sh b/releasePipeline/02-create-argocd-apps.sh index 0d791626..4fbd46a9 100755 --- 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 index 16e1750b..ccd83741 100644 --- 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 \ No newline at end of file diff --git a/releasePipeline/argocd-synced/pipelines/branch-delete-all.yaml b/releasePipeline/argocd-synced/pipelines/branch-delete-all.yaml index 220e303a..39827f7f 100644 --- 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 index 639aef7d..ffb2a841 100644 --- 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 From 2631acc0dc551c870172efb41b7f5f1ed7e3a6af Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 27 Sep 2024 14:34:00 +0100 Subject: [PATCH 5/5] delete deploy-maven-galasa Task not used Signed-off-by: Jade Carino --- .../tasks/deploy-maven-galasa.yaml | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 releasePipeline/argocd-synced/tasks/deploy-maven-galasa.yaml diff --git a/releasePipeline/argocd-synced/tasks/deploy-maven-galasa.yaml b/releasePipeline/argocd-synced/tasks/deploy-maven-galasa.yaml deleted file mode 100644 index cec3488f..00000000 --- a/releasePipeline/argocd-synced/tasks/deploy-maven-galasa.yaml +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright contributors to the Galasa project -# -# SPDX-License-Identifier: EPL-2.0 -# - -apiVersion: tekton.dev/v1beta1 -kind: Task -metadata: - name: deploy-maven-galasa - namespace: galasa-build -spec: - params: - - name: version - type: string - - name: repository - type: string - steps: -# -# -# Can't use the generic galasabld task for this as this requires galasabld to be run inside galasa-obr image -# Not worth creating a generic task as this is the only time this is done -# -# - - name: deploy-maven - image: harbor.galasa.dev/galasadev/galasa-obr-with-galasabld:release - imagePullPolicy: Always - command: - - galasabld - - maven - - deploy - - --repository - - $(params.repository) - - --local - - /usr/local/apache2/htdocs - - --group - - dev.galasa - - --version - - $(params.version) - - --credentials - - /workspace/git/$(context.pipelineRun.name)/creds/mavencreds.yaml - volumeMounts: - - name: mavencreds - mountPath: /workspace/git/$(context.pipelineRun.name)/creds - volumes: - - name: mavencreds - secret: - secretName: maven-creds \ No newline at end of file