From a772c693e4205153746b5becd83bcb434c06da35 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 25 Jul 2024 14:27:38 +0100 Subject: [PATCH 1/2] Fix indentation and improve readability Signed-off-by: Jade Carino --- .github/workflows/build.yaml | 123 ++++++++++++++++---------------- .github/workflows/pr-build.yaml | 76 ++++++++++---------- 2 files changed, 100 insertions(+), 99 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9a0d6902..5cc3c934 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,8 +1,8 @@ name: Main build on: - push: - branches: [main] + push: + branches: [main] env: REGISTRY: ghcr.io @@ -10,65 +10,66 @@ env: IMAGE_TAG: main jobs: - build-extensions: - name: build and Test Extensions - runs-on: ubuntu-latest + build-extensions: + name: Build Extensions source code and Docker image for development Maven registry + runs-on: ubuntu-latest - steps: - - name: Checkout Code - uses: actions/checkout@v4 - - - name: Setup JDK - uses: actions/setup-java@v4 - with: - java-version: '11' - distribution: 'semeru' - - - name: Print githash - run: | - echo $GITHUB_SHA > ./extensions.githash - - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-version: 6.9.2 - - - name: Test and Build Extensions using gradle - env: - GITHUB_ACTOR: ${{github.actor}} - GITHUB_TOKEN: ${{ github.token }} - ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.GPG_KEYID }} - ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_KEY }} - ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} - run: | - gradle -b galasa-extensions-parent/build.gradle check publish \ - -PsourceMaven=https://development.galasa.dev/gh/maven-repo/framework \ - -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - -PtargetMaven=${{ github.workspace }}/repo -PjacocoEnabled=true -PisMainOrRelease=true + steps: + - name: Checkout Code + uses: actions/checkout@v4 + + - name: Setup JDK + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'semeru' + + - name: Print githash + run: | + echo $GITHUB_SHA > ./extensions.githash + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + with: + gradle-version: 6.9.2 - - - name: Extract metadata for Extensions image - id: metadata - uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 - with: - images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/extensions-maven-artefacts - - - name: Build Extensions image for development Maven registry - id: build - uses: docker/build-push-action@v5 - with: - context: . - file: dockerfiles/dockerfile - push: true - tags: ${{ steps.metadata.outputs.tags }} - labels: ${{ steps.metadata.outputs.labels }} - build-args: | - dockerRepository=harbor.galasa.dev - tag=${{ env.IMAGE_TAG }} + - name: Build Extensions source code with gradle + env: + GITHUB_ACTOR: ${{ github.actor }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.GPG_KEYID }} + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_KEY }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} + run: | + gradle -b galasa-extensions-parent/build.gradle check publish \ + -PsourceMaven=https://development.galasa.dev/gh/maven-repo/framework \ + -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + -PtargetMaven=${{ github.workspace }}/repo \ + -PjacocoEnabled=true \ + -PisMainOrRelease=true + + - name: Extract metadata for Extensions image + id: metadata + uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + with: + images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/extensions-maven-artefacts - - name: Recycle application in ArgoCD - env: - ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }} - run: | - docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run gh-maven-repos restart --kind Deployment --resource-name extensions-gh --server argocd.galasa.dev - \ No newline at end of file + - name: Build Extensions image for development Maven registry + id: build + uses: docker/build-push-action@v5 + with: + context: . + file: dockerfiles/dockerfile + push: true + tags: ${{ steps.metadata.outputs.tags }} + labels: ${{ steps.metadata.outputs.labels }} + build-args: | + dockerRepository=harbor.galasa.dev + tag=${{ env.IMAGE_TAG }} + + - name: Recycle application in ArgoCD + env: + ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }} + run: | + docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run gh-maven-repos restart --kind Deployment --resource-name extensions-gh --server argocd.galasa.dev + \ No newline at end of file diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 05665d05..ab8ddcf8 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -5,46 +5,46 @@ on: branches: [main] env: - NAMESPACE: galasa-dev + NAMESPACE: galasa-dev jobs: - build-extensions: - name: build,Test and Publish Extensions - runs-on: ubuntu-latest + build-extensions: + name: Build Extensions source code + runs-on: ubuntu-latest - steps: - - name: Checkout Code - uses: actions/checkout@v4 - - - name: Setup JDK - uses: actions/setup-java@v4 - with: - java-version: '11' - distribution: 'semeru' - - - name: Print githash - run: | - echo $GITHUB_SHA > ./extensions.githash + steps: + - name: Checkout Code + uses: actions/checkout@v4 + + - name: Setup JDK + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'semeru' + + - name: Print githash + run: | + echo $GITHUB_SHA > ./extensions.githash - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-version: 6.9.2 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + with: + gradle-version: 6.9.2 - - name: Test and Build Extensions using gradle - run: | - gradle -b galasa-extensions-parent/build.gradle check publish \ - -PsourceMaven=https://development.galasa.dev/gh/maven-repo/framework \ - -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - -PtargetMaven=${{ github.workspace }}/repo - - - name: Build extensions Image for testing - uses: docker/build-push-action@v5 - with: - context: . - file: dockerfiles/dockerfile - load: true - tags: extensions:test - build-args: | - dockerRepository=harbor.galasa.dev - tag=main \ No newline at end of file + - name: Build Extensions source code with gradle + run: | + gradle -b galasa-extensions-parent/build.gradle check publish \ + -PsourceMaven=https://development.galasa.dev/gh/maven-repo/framework \ + -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + -PtargetMaven=${{ github.workspace }}/repo + + - name: Build Extensions image for testing + uses: docker/build-push-action@v5 + with: + context: . + file: dockerfiles/dockerfile + load: true + tags: extensions:test + build-args: | + dockerRepository=harbor.galasa.dev + tag=main \ No newline at end of file From badf610a3e8865cd37460c4875f54b54fcb77f8a Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 25 Jul 2024 14:37:17 +0100 Subject: [PATCH 2/2] Use new framework maven artefact image Signed-off-by: Jade Carino --- .github/workflows/build.yaml | 2 +- .github/workflows/pr-build.yaml | 2 +- dockerfiles/dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5cc3c934..8b4f4f3f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -64,7 +64,7 @@ jobs: tags: ${{ steps.metadata.outputs.tags }} labels: ${{ steps.metadata.outputs.labels }} build-args: | - dockerRepository=harbor.galasa.dev + dockerRepository=ghcr.io tag=${{ env.IMAGE_TAG }} - name: Recycle application in ArgoCD diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index ab8ddcf8..e69138e1 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -46,5 +46,5 @@ jobs: load: true tags: extensions:test build-args: | - dockerRepository=harbor.galasa.dev + dockerRepository=ghcr.io tag=main \ No newline at end of file diff --git a/dockerfiles/dockerfile b/dockerfiles/dockerfile index 34a309ca..23355635 100644 --- a/dockerfiles/dockerfile +++ b/dockerfiles/dockerfile @@ -1,6 +1,6 @@ ARG dockerRepository ARG tag -FROM ${dockerRepository}/galasadev/galasa-framework:${tag} +FROM ${dockerRepository}/galasa-dev/framework-maven-artefacts:${tag} COPY repo/ /usr/local/apache2/htdocs/ COPY extensions.githash /usr/local/apache2/htdocs/extensions.githash \ No newline at end of file