Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added test report generation/uploading , fixed java version, added workflow triggers #170

Merged
merged 7 commits into from
Aug 22, 2024
Merged

Added test report generation/uploading , fixed java version, added workflow triggers #170

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9bdef42
testing report generation
jaydee029 Aug 21, 2024
76db8cb
added test report generation/uploading added workflow triggers
jaydee029 Aug 22, 2024
c816b9e
fixed java version
jaydee029 Aug 22, 2024
3b52ed0
Merge pull request #9 from jaydee029/new
jaydee029 Aug 22, 2024
c031507
made required changes
jaydee029 Aug 22, 2024
5c94f9a
made required changes
jaydee029 Aug 22, 2024
435ab6d
Merge pull request #10 from jaydee029/new
jaydee029 Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 69 additions & 10 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'semeru'
cache: maven

Expand Down Expand Up @@ -110,12 +110,20 @@ jobs:

- name: Build Galasa BOM with maven
run: |
mvn -f ${{ github.workspace }}/obr/galasa-bom/pom.xml deploy \
set -o pipefail
mvn -f ${{ github.workspace }}/obr/galasa-bom/pom.xml -X deploy \
-Dgalasa.source.repo=https://development.galasa.dev/${{ env.ARGO_APP_BRANCH }}/maven-repo/managers \
-Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \
-Dgalasa.release.repo=file:${{ github.workspace }}/obr/repo \
--batch-mode --errors --fail-at-end \
--settings /home/runner/work/gpg/settings.xml
--settings /home/runner/work/gpg/settings.xml 2>&1 | tee galasa-bom-build.log

- name: Upload Galasa BOM Build Log
if: always()
uses: actions/upload-artifact@v4
with:
name: galasa-bom-build-log
path: galasa-bom-build.log

- name: Generate Galasa OBR
run: |
Expand All @@ -127,12 +135,20 @@ jobs:

- name: Build Galasa OBR with maven
run: |
mvn -f ${{ github.workspace }}/obr/dev.galasa.uber.obr/pom.xml deploy \
set -o pipefail
mvn -f ${{ github.workspace }}/obr/dev.galasa.uber.obr/pom.xml -X deploy \
-Dgalasa.source.repo=https://development.galasa.dev/${{ env.ARGO_APP_BRANCH }}/maven-repo/managers \
-Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \
-Dgalasa.release.repo=file:${{ github.workspace }}/obr/repo \
--batch-mode --errors --fail-at-end \
--settings /home/runner/work/gpg/settings.xml
--settings /home/runner/work/gpg/settings.xml 2>&1 | tee galasa-obr-build.log

- name: Upload Galasa OBR Build Log
if: always()
uses: actions/upload-artifact@v4
with:
name: galasa-obr-build-log
path: galasa-obr-build.log

- name: Login to Github Container Registry
uses: docker/login-action@v3
Expand Down Expand Up @@ -203,7 +219,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '18'
java-version: '17'
distribution: 'semeru'
cache: maven

Expand Down Expand Up @@ -252,12 +268,20 @@ jobs:

- name: Build javadoc site using maven
run: |
mvn -f ${{ github.workspace }}/obr/javadocs/pom.xml deploy \
set -o pipefail
mvn -f ${{ github.workspace }}/obr/javadocs/pom.xml -X deploy \
-Dgalasa.source.repo=https://development.galasa.dev/${{ env.ARGO_APP_BRANCH }}/maven-repo/managers \
-Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \
-Dgalasa.release.repo=file:${{ github.workspace }}/obr/javadocs/docker/repo \
-Dmaven.javadoc.failOnError=false --batch-mode --errors --fail-at-end \
--settings /home/runner/work/gpg/settings.xml
--settings /home/runner/work/gpg/settings.xml 2>&1 | tee build.log

- name: Upload javadoc site Build Log
if: always()
uses: actions/upload-artifact@v4
with:
name: javadoc-site-build-log
path: build.log

- name: Login to Github Container Registry
uses: docker/login-action@v3
Expand Down Expand Up @@ -350,6 +374,13 @@ jobs:
path: managers
ref: ${{ env.BRANCH }}

- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'semeru'
cache: maven

- name: Make secrets directory
run : |
mkdir /home/runner/work/secrets
Expand Down Expand Up @@ -396,12 +427,20 @@ jobs:
- name: Build Galasa OBR generic pom.xml with maven
working-directory: ${{ github.workspace }}/obr/obr-generic
run: |
mvn -f pom.xml process-sources \
set -o pipefail
mvn -f pom.xml -X process-sources \
-Dgalasa.source.repo=https://development.galasa.dev/${{ env.ARGO_APP_BRANCH }}/maven-repo/obr \
-Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \
dev.galasa:galasa-maven-plugin:0.15.0:obrembedded \
--batch-mode --errors --fail-at-end \
--settings /home/runner/work/gpg/settings.xml
--settings /home/runner/work/gpg/settings.xml 2>&1 | tee build.log

- name: Upload galasa obr generic Build Log
if: always()
uses: actions/upload-artifact@v4
with:
name: galasa-obr-generic-build-log
path: build.log

- name: Login to Github Container Registry
uses: docker/login-action@v3
Expand Down Expand Up @@ -472,3 +511,23 @@ jobs:
tag=${{ env.BRANCH }}
dockerRepository=${{ env.REGISTRY }}
platform=x86_64

trigger-workflow:
name: Trigger workflow depending upon the branch
needs: [build-obr, build-obr-generic, build-obr-javadocs]
runs-on: ubuntu-latest

steps:
- name: Triggering helm build (github.ref is main)
if: env.BRANCH == 'main'
jaydee029 marked this conversation as resolved.
Show resolved Hide resolved
env:
GH_TOKEN: ${{ secrets.GALASA_TEAM_GITHUB_TOKEN }}
run: |
gh workflow run build-helm.yaml --repo https://github.com/galasa-dev/automation --ref ${{ env.BRANCH }}
jaydee029 marked this conversation as resolved.
Show resolved Hide resolved

- name: Triggering cli build (github.ref is not main)
if: env.BRANCH != 'main'
jaydee029 marked this conversation as resolved.
Show resolved Hide resolved
env:
GH_TOKEN: ${{ secrets.GALASA_TEAM_GITHUB_TOKEN }}
run: |
gh workflow run build.yaml --repo https://github.com/galasa-dev/cli --ref ${{ env.BRANCH }}
jaydee029 marked this conversation as resolved.
Show resolved Hide resolved
27 changes: 17 additions & 10 deletions .github/workflows/pr-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'semeru'
cache: maven

Expand Down Expand Up @@ -96,13 +96,13 @@ jobs:

- name: Build Galasa BOM with maven
run: |
mvn -f ${{ github.workspace }}/obr/galasa-bom/pom.xml deploy \
mvn -f ${{ github.workspace }}/obr/galasa-bom/pom.xml -X deploy \
-Dgpg.skip=true \
-Dgalasa.source.repo=https://development.galasa.dev/gh/maven-repo/managers \
-Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \
-Dgalasa.release.repo=file:${{ github.workspace }}/obr/repo \
--batch-mode --errors --fail-at-end \
--settings /home/runner/work/gpg/settings.xml
--settings /home/runner/work/gpg/settings.xml

- name: Generate Galasa OBR
run: |
Expand All @@ -114,13 +114,13 @@ jobs:

- name: Build Galasa OBR with maven
run: |
mvn -f ${{ github.workspace }}/obr/dev.galasa.uber.obr/pom.xml deploy \
mvn -f ${{ github.workspace }}/obr/dev.galasa.uber.obr/pom.xml -X deploy \
-Dgpg.skip=true \
-Dgalasa.source.repo=https://development.galasa.dev/gh/maven-repo/managers \
-Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \
-Dgalasa.release.repo=file:${{ github.workspace }}/obr/repo \
--batch-mode --errors --fail-at-end \
--settings /home/runner/work/gpg/settings.xml
--settings /home/runner/work/gpg/settings.xml

- name: Build OBR image for testing
uses: docker/build-push-action@v5
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '18'
java-version: '17'
distribution: 'semeru'
cache: maven

Expand Down Expand Up @@ -213,13 +213,13 @@ jobs:

- name: Build javadoc site using maven
run: |
mvn -f ${{ github.workspace }}/obr/javadocs/pom.xml deploy \
mvn -f ${{ github.workspace }}/obr/javadocs/pom.xml -X deploy \
-Dgpg.skip=true \
-Dgalasa.source.repo=https://development.galasa.dev/gh/maven-repo/managers \
-Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \
-Dgalasa.release.repo=file:${{ github.workspace }}/obr/javadocs/docker/repo \
-Dmaven.javadoc.failOnError=false --batch-mode --errors --fail-at-end \
--settings /home/runner/work/gpg/settings.xml
--settings /home/runner/work/gpg/settings.xml

- name: Build Javadoc site image for testing
uses: docker/build-push-action@v5
Expand Down Expand Up @@ -276,17 +276,24 @@ jobs:
- name: Display Galasa OBR generic pom.xml
run: |
cat ${{ github.workspace }}/obr/obr-generic/pom.xml

- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'semeru'
cache: maven

- name: Build Galasa OBR generic pom.xml with maven
working-directory: ${{ github.workspace }}/obr/obr-generic
run: |
mvn -f pom.xml process-sources \
mvn -f pom.xml -X process-sources \
-Dgpg.skip=true \
-Dgalasa.source.repo=https://development.galasa.dev/gh/maven-repo/obr \
-Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \
dev.galasa:galasa-maven-plugin:0.15.0:obrembedded \
--batch-mode --errors --fail-at-end \
--settings settings.xml
--settings settings.xml

- name: Build OBR generic image for testing
uses: docker/build-push-action@v5
Expand Down