diff --git a/dockerfiles/galasabld/galasabld-dockerfile b/dockerfiles/galasabld/galasabld-dockerfile index 1522456b..5d01e069 100644 --- a/dockerfiles/galasabld/galasabld-dockerfile +++ b/dockerfiles/galasabld/galasabld-dockerfile @@ -3,4 +3,7 @@ FROM alpine ARG platform COPY bin/galasabld-${platform} /bin/galasabld + +COPY bin/ /usr/local/apache2/htdocs/ + ENTRYPOINT ["/bin/galasabld"] \ No newline at end of file diff --git a/dockerfiles/obr/obr-dockerfile b/dockerfiles/obr/obr-dockerfile index b13be6ac..e638e985 100644 --- a/dockerfiles/obr/obr-dockerfile +++ b/dockerfiles/obr/obr-dockerfile @@ -1,7 +1,13 @@ ARG dockerRepository ARG tag +FROM ${dockerRepository}/galasadev/galasabld:main AS buildutils + FROM ${dockerRepository}/galasadev/galasa-managers:${tag} +# RUN apt update && apt install -y ca-certificates && rm -rf /var/lib/apt/lists/* + COPY repo/ /usr/local/apache2/htdocs/ +COPY obr.githash /usr/local/apache2/htdocs/obr.githash -COPY obr.githash /usr/local/apache2/htdocs/obr.githash \ No newline at end of file +COPY --from=buildutils /usr/local/apache2/htdocs/galasabld-linux-amd64 /usr/local/apache2/htdocs/galasabld +RUN chmod +x /usr/local/apache2/htdocs/galasabld \ No newline at end of file diff --git a/releasePipeline/30-deploy-maven-galasa.yaml b/releasePipeline/30-deploy-maven-galasa.yaml index 6a92021b..e411d00d 100644 --- a/releasePipeline/30-deploy-maven-galasa.yaml +++ b/releasePipeline/30-deploy-maven-galasa.yaml @@ -4,7 +4,7 @@ kind: PipelineRun apiVersion: tekton.dev/v1beta1 metadata: - generateName: complete- + generateName: deploy-maven-galasa- annotations: argocd.argoproj.io/compare-options: IgnoreExtraneous argocd.argoproj.io/sync-options: Prune=false diff --git a/releasePipeline/README.md b/releasePipeline/README.md index 11e354f4..bf589965 100644 --- a/releasePipeline/README.md +++ b/releasePipeline/README.md @@ -104,14 +104,4 @@ All the tests must past, reruns need to be managed manually at the moment. 1. Create a new Issue to cover the version bump and the appropriate branch development environment. 1. 99-move-to-new-version.md - Change the repos and files as listed in this file. 1. Run a complete build to verify everything looks ok. -1. Raise PRs to push the version changes. Due to the nature of Galasa build, later PRs will fail until the previous PRs are pushed and built. - - - - -TO DO: -20 - Update complete- PRun to make sure correct -21 - Update cli build PRun to make sure correct -30 - Make any updates -31 - Get sonatype login and check if still relevant -41 - Get Eclipse marketplace login +1. Raise PRs to push the version changes. Due to the nature of Galasa build, later PRs will fail until the previous PRs are pushed and built. \ No newline at end of file diff --git a/releasePipeline/pipelines/deploy-maven-galasa.yaml b/releasePipeline/pipelines/deploy-maven-galasa.yaml index 3dcdcb17..2fc34ab4 100644 --- a/releasePipeline/pipelines/deploy-maven-galasa.yaml +++ b/releasePipeline/pipelines/deploy-maven-galasa.yaml @@ -12,9 +12,6 @@ spec: - name: repository type: string default: "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2" - - name: dockerRepo - type: string - default: harbor.galasa.dev # # # diff --git a/releasePipeline/tasks/deploy-maven-galasa.yaml b/releasePipeline/tasks/deploy-maven-galasa.yaml index e7b8be50..af4528f8 100644 --- a/releasePipeline/tasks/deploy-maven-galasa.yaml +++ b/releasePipeline/tasks/deploy-maven-galasa.yaml @@ -11,20 +11,13 @@ spec: type: string - name: repository type: string - - name: dockerRepo - type: string steps: - - name: cat - image: $(params.dockerRepo)/galasadev/galasa-obr:{{ .Values.branch }} // JADE TO DO - WHAT SHOULD THIS BE? - imagePullPolicy: Always - command: - - cat - - /workspace/git/$(context.pipelineRun.name)/creds/mavencreds.yaml - volumeMounts: - - name: mavencreds - mountPath: /workspace/git/$(context.pipelineRun.name)/creds +# +# +# +# Can't use generic galasabld task for this as requires galasabld to be run inside galasa-obr image - name: deploy-maven - image: $(params.dockerRepo)/galasadev/galasa-obr:{{ .Values.branch }} + image: harbor.galasa.dev/galasadev/galasa-obr:release imagePullPolicy: Always command: - /usr/local/apache2/htdocs/galasabld @@ -46,4 +39,4 @@ spec: volumes: - name: mavencreds secret: - secretName: maven-creds // JADE TO DO - FIND EQUIVALENT + secretName: maven-creds