From 08ce03b8fbc425effc78cbc2284c0ef90aa176e8 Mon Sep 17 00:00:00 2001 From: dhruv Date: Fri, 9 Aug 2024 20:15:24 +0530 Subject: [PATCH 01/10] added build and pr build workflows Signed-off-by: dhruv --- .github/workflows/build.yaml | 81 +++++++++++++++++++++++++++++ .github/workflows/pr-build.yaml | 64 +++++++++++++++++++++++ dockerfiles/dockerfile.inttests | 11 ++++ galasa-inttests-parent/build.gradle | 4 +- 4 files changed, 158 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/build.yaml create mode 100644 .github/workflows/pr-build.yaml create mode 100644 dockerfiles/dockerfile.inttests diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 0000000..d4b1025 --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,81 @@ +name: PR Build + +on: + pull_request: + branches: [main] + +env: + REGISTRY: ghcr.io + NAMESPACE: galasa-dev + IMAGE_TAG: latest + +jobs: + build-integrationtests: + name: Building the Integration Tests Repository + 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' + cache: maven + + - name: Print githash + run: | + echo $GITHUB_SHA > ./inttests.githash + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + with: + gradle-version: 6.9.2 + + - name: Build Integration Tests Gradle source code + run: | + gradle publish publishToMavenLocal \ + -PsourceMaven=https://development.galasa.dev/gh/maven-repo/obr \ + -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + -PtargetMaven=${{github.workspace}}/repo + + - name: Building Integration Tests Maven source code + run: | + mvn -f galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml deploy \ + -Dgalasa.source.repo=https://development.galasa.dev/gh/maven-repo/obr \ + -Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \ + -Dgalasa.release.repo=file:${{ github.workspace }}/repo \ + -Dgalasa.skip.deploytestcatalog=true \ + -Dgalasa.skip.bundletestcatalog=false \ + --batch-mode --errors --fail-at-end + + - name: Login to Github Container Registry + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata for Integration Tests image + id: metadata + uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + with: + images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/inttests-artefacts + + - name: Build Integration Tests image for development Maven registry + id: build + uses: docker/build-push-action@v5 + with: + context: . + file: dockerfiles/dockerfile.inttests + push: true + tags: ${{ steps.metadata.outputs.tags }} + labels: ${{ steps.metadata.outputs.labels }} + build-args: | + baseVersion=${{env.IMAGE_TAG}} + dockerRepository=harbor.galasa.dev + branch=main + + \ No newline at end of file diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml new file mode 100644 index 0000000..e56afce --- /dev/null +++ b/.github/workflows/pr-build.yaml @@ -0,0 +1,64 @@ +name: PR Build + +on: + pull_request: + branches: [main] + +env: + IMAGE_TAG: latest + +jobs: + build-integrationtests: + name: Building the Integration Tests Repository + 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' + cache: maven + + - name: Print githash + run: | + echo $GITHUB_SHA > ./inttests.githash + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + with: + gradle-version: 6.9.2 + + - name: Build Integration Tests Gradle source code + run: | + gradle publish publishToMavenLocal \ + -PsourceMaven=https://development.galasa.dev/gh/maven-repo/obr \ + -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + -PtargetMaven=${{github.workspace}}/repo + + - name: Building Integration Tests Maven source code + run: | + mvn -f galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml deploy -Dgpg.skip=true \ + -Dgalasa.source.repo=https://development.galasa.dev/gh/maven-repo/obr \ + -Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \ + -Dgalasa.release.repo=file:${{ github.workspace }}/repo \ + -Dgalasa.skip.deploytestcatalog=true \ + -Dgalasa.skip.bundletestcatalog=false \ + --batch-mode --errors --fail-at-end + + - name: Build Integration Tests image for testing + uses: docker/build-push-action@v5 + with: + context: . + file: dockerfiles/dockerfile.inttests + load: true + tags: intests:test + build-args: | + baseVersion=${{env.IMAGE_TAG}} + dockerRepository=harbor.galasa.dev + branch=main + + \ No newline at end of file diff --git a/dockerfiles/dockerfile.inttests b/dockerfiles/dockerfile.inttests new file mode 100644 index 0000000..33d2382 --- /dev/null +++ b/dockerfiles/dockerfile.inttests @@ -0,0 +1,11 @@ +ARG baseVersion +ARG dockerRepository +FROM ${dockerRepository}/galasadev/galasa-base:${baseVersion} + +ARG branch + +RUN sed -i "s/--branchname--/${branch}/" /usr/local/apache2/conf/httpd.conf +RUN sed -i 's/--repositoryname--/inttests/' /usr/local/apache2/conf/httpd.conf + +COPY repo/ /usr/local/apache2/htdocs/ +COPY inttests.githash /usr/local/apache2/htdocs/inttests.githash \ No newline at end of file diff --git a/galasa-inttests-parent/build.gradle b/galasa-inttests-parent/build.gradle index 3227df5..4e72871 100644 --- a/galasa-inttests-parent/build.gradle +++ b/galasa-inttests-parent/build.gradle @@ -72,8 +72,8 @@ subprojects { if ("$targetMaven".startsWith('http')) { credentials { - username System.getenv('MAVENUSERNAME') - password System.getenv('MAVENPASSWORD') + username System.getenv('GITHUB_ACTOR') + password System.getenv('GITHUB_TOKEN') } } } From 06511dcfdfe50df922ad2388c261cfd9443d4d56 Mon Sep 17 00:00:00 2001 From: dhruv Date: Fri, 9 Aug 2024 20:19:00 +0530 Subject: [PATCH 02/10] edited build and pr build workflows Signed-off-by: dhruv --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d4b1025..672bf4d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,4 +1,4 @@ -name: PR Build +name: Main Build on: pull_request: From 4c008e7a0b504018afe49eb60dffed320bdfd790 Mon Sep 17 00:00:00 2001 From: dhruv Date: Fri, 9 Aug 2024 20:26:55 +0530 Subject: [PATCH 03/10] edited build and pr build workflows Signed-off-by: dhruv --- .github/workflows/build.yaml | 2 +- .github/workflows/pr-build.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 672bf4d..ffa3cef 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -36,7 +36,7 @@ jobs: - name: Build Integration Tests Gradle source code run: | - gradle publish publishToMavenLocal \ + gradle publish \ -PsourceMaven=https://development.galasa.dev/gh/maven-repo/obr \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=${{github.workspace}}/repo diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index e56afce..1f7e2c2 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -34,7 +34,7 @@ jobs: - name: Build Integration Tests Gradle source code run: | - gradle publish publishToMavenLocal \ + gradle publishToMavenLocal \ -PsourceMaven=https://development.galasa.dev/gh/maven-repo/obr \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=${{github.workspace}}/repo From 8bb76d1c728f7fba470e473cbdee1aa6eff20bf1 Mon Sep 17 00:00:00 2001 From: dhruv Date: Fri, 9 Aug 2024 20:34:54 +0530 Subject: [PATCH 04/10] edited build and pr build workflow Signed-off-by: dhruv --- .github/workflows/build.yaml | 2 +- .github/workflows/pr-build.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ffa3cef..8972b07 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -36,7 +36,7 @@ jobs: - name: Build Integration Tests Gradle source code run: | - gradle publish \ + gradle -b galasa-inttests-parent/build.gradle publish publishToMavenLocal \ -PsourceMaven=https://development.galasa.dev/gh/maven-repo/obr \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=${{github.workspace}}/repo diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 1f7e2c2..aab75ad 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -34,7 +34,7 @@ jobs: - name: Build Integration Tests Gradle source code run: | - gradle publishToMavenLocal \ + gradle -b galasa-inttests-parent/build.gradle publish publishToMavenLocal \ -PsourceMaven=https://development.galasa.dev/gh/maven-repo/obr \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=${{github.workspace}}/repo From 55399f51525f951dbf9dcba43968d6ecd841a74d Mon Sep 17 00:00:00 2001 From: dhruv Date: Fri, 9 Aug 2024 20:49:30 +0530 Subject: [PATCH 05/10] edited build and pr build workflow Signed-off-by: dhruv --- .github/workflows/build.yaml | 55 +++++++++++++++++++++++++++++++-- .github/workflows/pr-build.yaml | 42 ++++++++++++++++++++++++- 2 files changed, 94 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8972b07..c01e495 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,6 +28,45 @@ jobs: - name: Print githash run: | echo $GITHUB_SHA > ./inttests.githash + + - name: Make secrets directory + run : | + mkdir /home/runner/work/secrets + + - name: Copy settings.xml + env: + MAVEN_SETTINGS_XML: ${{ secrets.MAVEN_SETTINGS_XML }} + run : | + echo $MAVEN_SETTINGS_XML > /home/runner/work/secrets/settings.xml + + - name: Copy GPG passphrase + env: + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + run : | + echo $GPG_PASSPHRASE > /home/runner/work/secrets/passphrase.file + + - name: Copy GPG key + env: + GPG_KEY_BASE64: ${{ secrets.GPG_KEY }} + run : | + echo $GPG_KEY_BASE64 | base64 --decode > /home/runner/work/secrets/galasa.gpg + + # Set up Maven GPG directory + - name: Make GPG home directory + run: | + mkdir /home/runner/work/gpg + + - name: Change directory permissions + run: | + chmod '700' /home/runner/work/gpg + + - name: Import GPG + run: | + gpg --homedir /home/runner/work/gpg --pinentry-mode loopback --passphrase-file /home/runner/work/secrets/passphrase.file --import /home/runner/work/secrets/galasa.gpg + + - name: Copy custom settings.xml + run: | + cp /home/runner/work/secrets/settings.xml /home/runner/work/gpg/settings.xml - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 @@ -49,7 +88,8 @@ jobs: -Dgalasa.release.repo=file:${{ github.workspace }}/repo \ -Dgalasa.skip.deploytestcatalog=true \ -Dgalasa.skip.bundletestcatalog=false \ - --batch-mode --errors --fail-at-end + --batch-mode --errors --fail-at-end \ + --settings /home/runner/work/gpg/settings.xml - name: Login to Github Container Registry uses: docker/login-action@v3 @@ -78,4 +118,15 @@ jobs: dockerRepository=harbor.galasa.dev branch=main - \ No newline at end of file + - 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 inttests-gh --server argocd.galasa.dev + + - name: Wait for app health 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 wait gh-maven-repos --resource apps:Deployment:inttests-gh --health --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 aab75ad..95e3ce4 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -23,6 +23,45 @@ jobs: distribution: 'semeru' cache: maven + - name: Make secrets directory + run : | + mkdir /home/runner/work/secrets + + - name: Copy settings.xml + env: + MAVEN_SETTINGS_XML: ${{ secrets.MAVEN_SETTINGS_XML }} + run : | + echo $MAVEN_SETTINGS_XML > /home/runner/work/secrets/settings.xml + + - name: Copy GPG passphrase + env: + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + run : | + echo $GPG_PASSPHRASE > /home/runner/work/secrets/passphrase.file + + - name: Copy GPG key + env: + GPG_KEY_BASE64: ${{ secrets.GPG_KEY }} + run : | + echo $GPG_KEY_BASE64 | base64 --decode > /home/runner/work/secrets/galasa.gpg + + # Set up Maven GPG directory + - name: Make GPG home directory + run: | + mkdir /home/runner/work/gpg + + - name: Change directory permissions + run: | + chmod '700' /home/runner/work/gpg + + - name: Import GPG + run: | + gpg --homedir /home/runner/work/gpg --pinentry-mode loopback --passphrase-file /home/runner/work/secrets/passphrase.file --import /home/runner/work/secrets/galasa.gpg + + - name: Copy custom settings.xml + run: | + cp /home/runner/work/secrets/settings.xml /home/runner/work/gpg/settings.xml + - name: Print githash run: | echo $GITHUB_SHA > ./inttests.githash @@ -47,7 +86,8 @@ jobs: -Dgalasa.release.repo=file:${{ github.workspace }}/repo \ -Dgalasa.skip.deploytestcatalog=true \ -Dgalasa.skip.bundletestcatalog=false \ - --batch-mode --errors --fail-at-end + --batch-mode --errors --fail-at-end \ + --settings /home/runner/work/gpg/settings.xml - name: Build Integration Tests image for testing uses: docker/build-push-action@v5 From 9ddee43c7bba6e870434fe6c4bdb412ca6cd5d68 Mon Sep 17 00:00:00 2001 From: dhruv Date: Sat, 10 Aug 2024 10:58:14 +0530 Subject: [PATCH 06/10] edited build workflow Signed-off-by: dhruv --- .github/workflows/build.yaml | 2 +- .github/workflows/pr-build.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c01e495..be3d805 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -89,7 +89,7 @@ jobs: -Dgalasa.skip.deploytestcatalog=true \ -Dgalasa.skip.bundletestcatalog=false \ --batch-mode --errors --fail-at-end \ - --settings /home/runner/work/gpg/settings.xml + --settings ${{github.workspace}}/settings.xml - name: Login to Github Container Registry uses: docker/login-action@v3 diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 95e3ce4..89610c6 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -87,7 +87,8 @@ jobs: -Dgalasa.skip.deploytestcatalog=true \ -Dgalasa.skip.bundletestcatalog=false \ --batch-mode --errors --fail-at-end \ - --settings /home/runner/work/gpg/settings.xml + --settings ${{github.workspace}}/settings.xml + - name: Build Integration Tests image for testing uses: docker/build-push-action@v5 From 2fe81cb590406fb50dafd16cdcc2ea58450fa965 Mon Sep 17 00:00:00 2001 From: dhruv Date: Sat, 10 Aug 2024 11:03:41 +0530 Subject: [PATCH 07/10] edited build workflows Signed-off-by: dhruv --- .github/workflows/build.yaml | 62 ++++++++++++++++----------------- .github/workflows/pr-build.yaml | 62 ++++++++++++++++----------------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index be3d805..3a0b3aa 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -29,44 +29,44 @@ jobs: run: | echo $GITHUB_SHA > ./inttests.githash - - name: Make secrets directory - run : | - mkdir /home/runner/work/secrets + # - name: Make secrets directory + # run : | + # mkdir /home/runner/work/secrets - - name: Copy settings.xml - env: - MAVEN_SETTINGS_XML: ${{ secrets.MAVEN_SETTINGS_XML }} - run : | - echo $MAVEN_SETTINGS_XML > /home/runner/work/secrets/settings.xml + # - name: Copy settings.xml + # env: + # MAVEN_SETTINGS_XML: ${{ secrets.MAVEN_SETTINGS_XML }} + # run : | + # echo $MAVEN_SETTINGS_XML > /home/runner/work/secrets/settings.xml - - name: Copy GPG passphrase - env: - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - run : | - echo $GPG_PASSPHRASE > /home/runner/work/secrets/passphrase.file + # - name: Copy GPG passphrase + # env: + # GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + # run : | + # echo $GPG_PASSPHRASE > /home/runner/work/secrets/passphrase.file - - name: Copy GPG key - env: - GPG_KEY_BASE64: ${{ secrets.GPG_KEY }} - run : | - echo $GPG_KEY_BASE64 | base64 --decode > /home/runner/work/secrets/galasa.gpg + # - name: Copy GPG key + # env: + # GPG_KEY_BASE64: ${{ secrets.GPG_KEY }} + # run : | + # echo $GPG_KEY_BASE64 | base64 --decode > /home/runner/work/secrets/galasa.gpg - # Set up Maven GPG directory - - name: Make GPG home directory - run: | - mkdir /home/runner/work/gpg + # # Set up Maven GPG directory + # - name: Make GPG home directory + # run: | + # mkdir /home/runner/work/gpg - - name: Change directory permissions - run: | - chmod '700' /home/runner/work/gpg + # - name: Change directory permissions + # run: | + # chmod '700' /home/runner/work/gpg - - name: Import GPG - run: | - gpg --homedir /home/runner/work/gpg --pinentry-mode loopback --passphrase-file /home/runner/work/secrets/passphrase.file --import /home/runner/work/secrets/galasa.gpg + # - name: Import GPG + # run: | + # gpg --homedir /home/runner/work/gpg --pinentry-mode loopback --passphrase-file /home/runner/work/secrets/passphrase.file --import /home/runner/work/secrets/galasa.gpg - - name: Copy custom settings.xml - run: | - cp /home/runner/work/secrets/settings.xml /home/runner/work/gpg/settings.xml + # - name: Copy custom settings.xml + # run: | + # cp /home/runner/work/secrets/settings.xml /home/runner/work/gpg/settings.xml - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 89610c6..5d7fe6b 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -23,44 +23,44 @@ jobs: distribution: 'semeru' cache: maven - - name: Make secrets directory - run : | - mkdir /home/runner/work/secrets + # - name: Make secrets directory + # run : | + # mkdir /home/runner/work/secrets - - name: Copy settings.xml - env: - MAVEN_SETTINGS_XML: ${{ secrets.MAVEN_SETTINGS_XML }} - run : | - echo $MAVEN_SETTINGS_XML > /home/runner/work/secrets/settings.xml + # - name: Copy settings.xml + # env: + # MAVEN_SETTINGS_XML: ${{ secrets.MAVEN_SETTINGS_XML }} + # run : | + # echo $MAVEN_SETTINGS_XML > /home/runner/work/secrets/settings.xml - - name: Copy GPG passphrase - env: - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - run : | - echo $GPG_PASSPHRASE > /home/runner/work/secrets/passphrase.file + # - name: Copy GPG passphrase + # env: + # GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + # run : | + # echo $GPG_PASSPHRASE > /home/runner/work/secrets/passphrase.file - - name: Copy GPG key - env: - GPG_KEY_BASE64: ${{ secrets.GPG_KEY }} - run : | - echo $GPG_KEY_BASE64 | base64 --decode > /home/runner/work/secrets/galasa.gpg + # - name: Copy GPG key + # env: + # GPG_KEY_BASE64: ${{ secrets.GPG_KEY }} + # run : | + # echo $GPG_KEY_BASE64 | base64 --decode > /home/runner/work/secrets/galasa.gpg - # Set up Maven GPG directory - - name: Make GPG home directory - run: | - mkdir /home/runner/work/gpg + # # Set up Maven GPG directory + # - name: Make GPG home directory + # run: | + # mkdir /home/runner/work/gpg - - name: Change directory permissions - run: | - chmod '700' /home/runner/work/gpg + # - name: Change directory permissions + # run: | + # chmod '700' /home/runner/work/gpg - - name: Import GPG - run: | - gpg --homedir /home/runner/work/gpg --pinentry-mode loopback --passphrase-file /home/runner/work/secrets/passphrase.file --import /home/runner/work/secrets/galasa.gpg + # - name: Import GPG + # run: | + # gpg --homedir /home/runner/work/gpg --pinentry-mode loopback --passphrase-file /home/runner/work/secrets/passphrase.file --import /home/runner/work/secrets/galasa.gpg - - name: Copy custom settings.xml - run: | - cp /home/runner/work/secrets/settings.xml /home/runner/work/gpg/settings.xml + # - name: Copy custom settings.xml + # run: | + # cp /home/runner/work/secrets/settings.xml /home/runner/work/gpg/settings.xml - name: Print githash run: | From fc1a2fcc689e41a38df1d07f78102b1bbc64f6f1 Mon Sep 17 00:00:00 2001 From: dhruv Date: Sat, 10 Aug 2024 11:43:13 +0530 Subject: [PATCH 08/10] edited build workflows Signed-off-by: dhruv --- .github/workflows/build.yaml | 41 +-------------------------------- .github/workflows/pr-build.yaml | 41 +-------------------------------- 2 files changed, 2 insertions(+), 80 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3a0b3aa..5df63af 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,7 +1,7 @@ name: Main Build on: - pull_request: + push: branches: [main] env: @@ -28,45 +28,6 @@ jobs: - name: Print githash run: | echo $GITHUB_SHA > ./inttests.githash - - # - name: Make secrets directory - # run : | - # mkdir /home/runner/work/secrets - - # - name: Copy settings.xml - # env: - # MAVEN_SETTINGS_XML: ${{ secrets.MAVEN_SETTINGS_XML }} - # run : | - # echo $MAVEN_SETTINGS_XML > /home/runner/work/secrets/settings.xml - - # - name: Copy GPG passphrase - # env: - # GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - # run : | - # echo $GPG_PASSPHRASE > /home/runner/work/secrets/passphrase.file - - # - name: Copy GPG key - # env: - # GPG_KEY_BASE64: ${{ secrets.GPG_KEY }} - # run : | - # echo $GPG_KEY_BASE64 | base64 --decode > /home/runner/work/secrets/galasa.gpg - - # # Set up Maven GPG directory - # - name: Make GPG home directory - # run: | - # mkdir /home/runner/work/gpg - - # - name: Change directory permissions - # run: | - # chmod '700' /home/runner/work/gpg - - # - name: Import GPG - # run: | - # gpg --homedir /home/runner/work/gpg --pinentry-mode loopback --passphrase-file /home/runner/work/secrets/passphrase.file --import /home/runner/work/secrets/galasa.gpg - - # - name: Copy custom settings.xml - # run: | - # cp /home/runner/work/secrets/settings.xml /home/runner/work/gpg/settings.xml - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 5d7fe6b..7fcfe5d 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -22,46 +22,7 @@ jobs: java-version: '11' distribution: 'semeru' cache: maven - - # - name: Make secrets directory - # run : | - # mkdir /home/runner/work/secrets - - # - name: Copy settings.xml - # env: - # MAVEN_SETTINGS_XML: ${{ secrets.MAVEN_SETTINGS_XML }} - # run : | - # echo $MAVEN_SETTINGS_XML > /home/runner/work/secrets/settings.xml - - # - name: Copy GPG passphrase - # env: - # GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - # run : | - # echo $GPG_PASSPHRASE > /home/runner/work/secrets/passphrase.file - - # - name: Copy GPG key - # env: - # GPG_KEY_BASE64: ${{ secrets.GPG_KEY }} - # run : | - # echo $GPG_KEY_BASE64 | base64 --decode > /home/runner/work/secrets/galasa.gpg - - # # Set up Maven GPG directory - # - name: Make GPG home directory - # run: | - # mkdir /home/runner/work/gpg - - # - name: Change directory permissions - # run: | - # chmod '700' /home/runner/work/gpg - - # - name: Import GPG - # run: | - # gpg --homedir /home/runner/work/gpg --pinentry-mode loopback --passphrase-file /home/runner/work/secrets/passphrase.file --import /home/runner/work/secrets/galasa.gpg - - # - name: Copy custom settings.xml - # run: | - # cp /home/runner/work/secrets/settings.xml /home/runner/work/gpg/settings.xml - + - name: Print githash run: | echo $GITHUB_SHA > ./inttests.githash From 828af4cfcdb910eb811153805f9a97fa3a04aa29 Mon Sep 17 00:00:00 2001 From: dhruv Date: Mon, 12 Aug 2024 20:41:22 +0530 Subject: [PATCH 09/10] made required changes Signed-off-by: dhruv --- .github/workflows/build.yaml | 5 ++--- .github/workflows/pr-build.yaml | 5 +---- dockerfiles/dockerfile.inttests | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5df63af..3de76c7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -7,7 +7,6 @@ on: env: REGISTRY: ghcr.io NAMESPACE: galasa-dev - IMAGE_TAG: latest jobs: build-integrationtests: @@ -63,7 +62,7 @@ jobs: id: metadata uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 with: - images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/inttests-artefacts + images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/inttests-maven-artefacts - name: Build Integration Tests image for development Maven registry id: build @@ -75,7 +74,7 @@ jobs: tags: ${{ steps.metadata.outputs.tags }} labels: ${{ steps.metadata.outputs.labels }} build-args: | - baseVersion=${{env.IMAGE_TAG}} + baseVersion=latest dockerRepository=harbor.galasa.dev branch=main diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 7fcfe5d..5682a32 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -4,9 +4,6 @@ on: pull_request: branches: [main] -env: - IMAGE_TAG: latest - jobs: build-integrationtests: name: Building the Integration Tests Repository @@ -59,7 +56,7 @@ jobs: load: true tags: intests:test build-args: | - baseVersion=${{env.IMAGE_TAG}} + baseVersion=latest dockerRepository=harbor.galasa.dev branch=main diff --git a/dockerfiles/dockerfile.inttests b/dockerfiles/dockerfile.inttests index 33d2382..62ef203 100644 --- a/dockerfiles/dockerfile.inttests +++ b/dockerfiles/dockerfile.inttests @@ -1,6 +1,6 @@ ARG baseVersion ARG dockerRepository -FROM ${dockerRepository}/galasadev/galasa-base:${baseVersion} +FROM ${dockerRepository}/galasa-dev/base-image:${baseVersion} ARG branch From 57678ef21ee74344e17043f0a6f1cffcbeed4ccb Mon Sep 17 00:00:00 2001 From: dhruv Date: Mon, 19 Aug 2024 22:54:36 +0530 Subject: [PATCH 10/10] added req changes Signed-off-by: dhruv --- .github/workflows/build.yaml | 2 +- .github/workflows/pr-build.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3de76c7..71621ac 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -75,7 +75,7 @@ jobs: labels: ${{ steps.metadata.outputs.labels }} build-args: | baseVersion=latest - dockerRepository=harbor.galasa.dev + dockerRepository=ghcr.io branch=main - name: Recycle application in ArgoCD diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 5682a32..8d7df2b 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -57,7 +57,7 @@ jobs: tags: intests:test build-args: | baseVersion=latest - dockerRepository=harbor.galasa.dev + dockerRepository=ghcr.io branch=main \ No newline at end of file