diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 6cf86a5..013d33c 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -269,105 +269,3 @@ jobs: build-args: | dockerRepository=${{ env.REGISTRY }} baseVersion=latest - - build-obr-generic: - name: Build OBR embedded and boot images using galasabld and maven - runs-on: ubuntu-latest - needs: [build-obr, build-obr-javadocs] - - steps: - - name: Checkout Code - uses: actions/checkout@v4 - with: - path: obr - - - name: Checkout framework - uses: actions/checkout@v4 - with: - repository: ${{ env.NAMESPACE }}/framework - path: framework - - - name: Checkout extensions - uses: actions/checkout@v4 - with: - repository: ${{ env.NAMESPACE }}/extensions - path: extensions - - - name: Checkout managers - uses: actions/checkout@v4 - with: - repository: ${{ env.NAMESPACE }}/managers - path: managers - - - name: Generate Galasa OBR generic pom.xml - run: | - docker run --rm -v ${{ github.workspace }}:/var/root/ ghcr.io/galasa-dev/galasabld-amd64:main template --releaseMetadata var/root/framework/release.yaml --releaseMetadata /var/root/extensions/release.yaml --releaseMetadata /var/root/managers/release.yaml --releaseMetadata /var/root/obr/release.yaml --template /var/root/obr/obr-generic/pom.template --output /var/root/obr/obr-generic/pom.xml --obr - - - 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' - - - name: Build Galasa OBR generic pom.xml with maven - working-directory: ${{ github.workspace }}/obr/obr-generic - run: | - set -o pipefail - mvn -f pom.xml process-sources -X \ - -Dgpg.skip=true \ - -Dgalasa.source.repo=https://development.galasa.dev/main/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 2>&1 | tee build.log - - - name: Upload galasa obr generic Build Log - if: failure() - uses: actions/upload-artifact@v4 - with: - name: galasa-obr-generic-build-log - path: build.log - retention-days: 7 - - - name: Build OBR generic image for testing - uses: docker/build-push-action@v5 - with: - context: obr - file: obr/dockerfiles/dockerfile.obrgeneric - load: true - tags: obr-generic:test - - - name: Copy files from kubectl image for Galasa boot embedded images - run: | - mkdir -p /opt/k8s/bin - curl -L https://dl.k8s.io/release/v1.22.0/bin/linux/amd64/kubectl -o /opt/k8s/bin/kubectl - chmod +x /opt/k8s/bin/kubectl - cp -vr /opt/k8s/bin/kubectl ${{ github.workspace }}/obr/dockerfiles/trace-log4j.properties ${{ github.workspace }}/obr/obr-generic/ - - - name: Build Galasa boot embedded image for testing - uses: docker/build-push-action@v5 - with: - context: obr - file: obr/dockerfiles/dockerfile.bootembedded - load: true - tags: galasa-boot-embedded-x86_64:test - build-args: | - tag=${{ env.IMAGE_TAG }} - dockerRepository=${{ env.REGISTRY }} - jdkImage=harbor.galasa.dev/docker_proxy_cache/library/openjdk:17 - - - name: Build Galasa IBM boot embedded image for testing - uses: docker/build-push-action@v5 - with: - context: obr - file: obr/dockerfiles/dockerfile.ibmbootembedded - load: true - tags: galasa-ibm-boot-embedded-x86_64:test - build-args: | - tag=${{ env.IMAGE_TAG }} - dockerRepository=${{ env.REGISTRY }} - platform=x86_64 diff --git a/dependency-download/build.gradle b/dependency-download/build.gradle index 613d0db..02851fb 100644 --- a/dependency-download/build.gradle +++ b/dependency-download/build.gradle @@ -7,7 +7,7 @@ plugins { // It is used as the version number of the managers bundle, which contains a yaml // file which is in a release.yaml, but published to maven, so that the OBR build // can pick it up later. -version = "0.37.0" +version = "0.38.0" repositories { mavenLocal() diff --git a/release.yaml b/release.yaml index 036c1c4..4c7ba5d 100644 --- a/release.yaml +++ b/release.yaml @@ -12,7 +12,7 @@ metadata: release: - version: 0.37.0 + version: 0.38.0