From 224b6f7ec2598a9661341e8747ff9b438c11d690 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 4 Dec 2024 15:03:17 +0000 Subject: [PATCH 1/8] Testing the MVP tar Signed-off-by: Jade Carino --- .github/workflows/pr-build.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 9d2412b..8941474 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -230,6 +230,12 @@ jobs: directory=isolated/full outputs: type=tar,dest=isolated/full/target/isolated/isolated.tar + - name: Upload isolated.tar (Isolated) for testing + uses: actions/upload-artifact@v4 + with: + name: isolated.tar + path: ${{ github.workspace }}/isolated/full/target/isolated/isolated.tar + - name: Build Isolated zip with maven working-directory: ./isolated/full run: | @@ -480,6 +486,12 @@ jobs: directory=isolated/mvp outputs: type=tar,dest=isolated/mvp/target/isolated/isolated.tar + - name: Upload isolated.tar (MVP) for testing + uses: actions/upload-artifact@v4 + with: + name: mvp.tar + path: ${{ github.workspace }}/isolated/full/target/isolated/isolated.tar + - name: Build MVP zip with maven working-directory: ./isolated/mvp run: | From ca1ebacdd030b6f8ea6d406a8cf5c45e036ec729 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 4 Dec 2024 15:15:28 +0000 Subject: [PATCH 2/8] fix path Signed-off-by: Jade Carino --- .github/workflows/pr-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 8941474..771cca8 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -490,7 +490,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: mvp.tar - path: ${{ github.workspace }}/isolated/full/target/isolated/isolated.tar + path: ${{ github.workspace }}/isolated/mvp/target/isolated/isolated.tar - name: Build MVP zip with maven working-directory: ./isolated/mvp From f19938d1ac751bc510ac4d9e80c714a1fec67f4c Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 4 Dec 2024 15:22:19 +0000 Subject: [PATCH 3/8] Build tar files manually with docker Signed-off-by: Jade Carino --- .github/workflows/pr-build.yaml | 48 +++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 771cca8..796ea75 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -219,16 +219,20 @@ jobs: build-args: | directory=isolated/full - - name: Build Docker image for Isolated tar file - uses: docker/build-push-action@v5 - with: - context: . - file: ${{ github.workspace }}/isolated/dockerfiles/dockerfile.isolated - load: true - tags: galasa-isolated-tar:test - build-args: | - directory=isolated/full - outputs: type=tar,dest=isolated/full/target/isolated/isolated.tar + # - name: Build Docker image for Isolated tar file + # uses: docker/build-push-action@v5 + # with: + # context: . + # file: ${{ github.workspace }}/isolated/dockerfiles/dockerfile.isolated + # load: true + # tags: galasa-isolated-tar:test + # build-args: | + # directory=isolated/full + # outputs: type=tar,dest=isolated/full/target/isolated/isolated.tar + + - name: Manually build isolated.tar (Isolated) + run: | + docker save -o ${{ github.workspace }}/isolated/full/target/isolated/isolated.tar ghcr.io/galasa-dev/galasa-isolated:main - name: Upload isolated.tar (Isolated) for testing uses: actions/upload-artifact@v4 @@ -475,16 +479,20 @@ jobs: build-args: | directory=isolated/mvp - - name: Build Docker image for MVP tar file - uses: docker/build-push-action@v5 - with: - context: . - file: ${{ github.workspace }}/isolated/dockerfiles/dockerfile.isolated - load: true - tags: galasa-mvp-tar:test - build-args: | - directory=isolated/mvp - outputs: type=tar,dest=isolated/mvp/target/isolated/isolated.tar + # - name: Build Docker image for MVP tar file + # uses: docker/build-push-action@v5 + # with: + # context: . + # file: ${{ github.workspace }}/isolated/dockerfiles/dockerfile.isolated + # load: true + # tags: galasa-mvp-tar:test + # build-args: | + # directory=isolated/mvp + # outputs: type=tar,dest=isolated/mvp/target/isolated/isolated.tar + + - name: Manually build isolated.tar (MVP) + run: | + docker save -o ${{ github.workspace }}/isolated/mvp/target/isolated/isolated.tar ghcr.io/galasa-dev/galasa-mvp:main - name: Upload isolated.tar (MVP) for testing uses: actions/upload-artifact@v4 From af98241784f5de6298d69f370b17162e10b7687c Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 4 Dec 2024 15:30:24 +0000 Subject: [PATCH 4/8] pull before saving int tar ball Signed-off-by: Jade Carino --- .github/workflows/pr-build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 796ea75..162afe8 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -232,6 +232,7 @@ jobs: - name: Manually build isolated.tar (Isolated) run: | + docker pull ghcr.io/galasa-dev/galasa-mvp:main docker save -o ${{ github.workspace }}/isolated/full/target/isolated/isolated.tar ghcr.io/galasa-dev/galasa-isolated:main - name: Upload isolated.tar (Isolated) for testing @@ -492,6 +493,7 @@ jobs: - name: Manually build isolated.tar (MVP) run: | + docker pull ghcr.io/galasa-dev/galasa-mvp:main docker save -o ${{ github.workspace }}/isolated/mvp/target/isolated/isolated.tar ghcr.io/galasa-dev/galasa-mvp:main - name: Upload isolated.tar (MVP) for testing From 2f954b5686d33b5c4a61cecf00e5fa2cf87dfcca Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 4 Dec 2024 15:57:12 +0000 Subject: [PATCH 5/8] Manually build tar files with docker save Signed-off-by: Jade Carino --- .github/workflows/build.yaml | 44 ++++++--------------------------- .github/workflows/pr-build.yaml | 38 ++++++---------------------- 2 files changed, 16 insertions(+), 66 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4e62f4c..0244a36 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -234,24 +234,10 @@ jobs: build-args: | directory=isolated/full - - name: Extract metadata for galasa-isolated-tar image - id: metadata-galasa-isolated-tar - uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 - with: - images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-isolated-tar - - - name: Build Docker image for Isolated tar file - id: build-galasa-isolated-tar - uses: docker/build-push-action@v5 - with: - context: . - file: ${{ github.workspace }}/isolated/dockerfiles/dockerfile.isolated - push: true - tags: ${{ steps.metadata-galasa-isolated-tar.outputs.tags }} - labels: ${{ steps.metadata-galasa-isolated-tar.outputs.labels }} - build-args: | - directory=isolated/full - outputs: type=tar,dest=isolated/full/target/isolated/isolated.tar + - name: Manually build isolated.tar (full isolated) + run: | + docker pull ghcr.io/galasa-dev/galasa-isolated:main + docker save -o ${{ github.workspace }}/isolated/full/target/isolated/isolated.tar ghcr.io/galasa-dev/galasa-isolated:main - name: Build Isolated zip with maven working-directory: ./isolated/full @@ -518,24 +504,10 @@ jobs: build-args: | directory=isolated/mvp - - name: Extract metadata for galasa-mvp-tar image - id: metadata-galasa-mvp-tar - uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 - with: - images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-mvp-tar - - - name: Build Docker image for MVP tar file - id: build-galasa-mvp-tar - uses: docker/build-push-action@v5 - with: - context: . - file: ${{ github.workspace }}/isolated/dockerfiles/dockerfile.isolated - push: true - tags: ${{ steps.metadata-galasa-mvp-tar.outputs.tags }} - labels: ${{ steps.metadata-galasa-mvp-tar.outputs.labels }} - build-args: | - directory=isolated/mvp - outputs: type=tar,dest=isolated/mvp/target/isolated/isolated.tar + - name: Manually build isolated.tar (MVP) + run: | + docker pull ghcr.io/galasa-dev/galasa-mvp:main + docker save -o ${{ github.workspace }}/isolated/mvp/target/isolated/isolated.tar ghcr.io/galasa-dev/galasa-mvp:main - name: Build MVP zip with maven working-directory: ./isolated/mvp diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 162afe8..496a345 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -215,27 +215,16 @@ jobs: context: . file: ${{ github.workspace }}/isolated/dockerfiles/dockerfile.isolated load: true - tags: galasa-isolated:test + tags: ghcr.io/galasa-dev/galasa-isolated:test build-args: | directory=isolated/full - # - name: Build Docker image for Isolated tar file - # uses: docker/build-push-action@v5 - # with: - # context: . - # file: ${{ github.workspace }}/isolated/dockerfiles/dockerfile.isolated - # load: true - # tags: galasa-isolated-tar:test - # build-args: | - # directory=isolated/full - # outputs: type=tar,dest=isolated/full/target/isolated/isolated.tar - - - name: Manually build isolated.tar (Isolated) + - name: Build isolated.tar file (full isolated) run: | - docker pull ghcr.io/galasa-dev/galasa-mvp:main - docker save -o ${{ github.workspace }}/isolated/full/target/isolated/isolated.tar ghcr.io/galasa-dev/galasa-isolated:main + docker pull ghcr.io/galasa-dev/galasa-isolated:test + docker save -o ${{ github.workspace }}/isolated/full/target/isolated/isolated.tar ghcr.io/galasa-dev/galasa-isolated:test - - name: Upload isolated.tar (Isolated) for testing + - name: Upload isolated.tar (full isolated) for inspection uses: actions/upload-artifact@v4 with: name: isolated.tar @@ -476,25 +465,14 @@ jobs: context: . file: ${{ github.workspace }}/isolated/dockerfiles/dockerfile.isolated load: true - tags: galasa-mvp:test + tags: ghcr.io/galasa-dev/galasa-mvp:test build-args: | directory=isolated/mvp - # - name: Build Docker image for MVP tar file - # uses: docker/build-push-action@v5 - # with: - # context: . - # file: ${{ github.workspace }}/isolated/dockerfiles/dockerfile.isolated - # load: true - # tags: galasa-mvp-tar:test - # build-args: | - # directory=isolated/mvp - # outputs: type=tar,dest=isolated/mvp/target/isolated/isolated.tar - - name: Manually build isolated.tar (MVP) run: | - docker pull ghcr.io/galasa-dev/galasa-mvp:main - docker save -o ${{ github.workspace }}/isolated/mvp/target/isolated/isolated.tar ghcr.io/galasa-dev/galasa-mvp:main + docker pull ghcr.io/galasa-dev/galasa-mvp:test + docker save -o ${{ github.workspace }}/isolated/mvp/target/isolated/isolated.tar ghcr.io/galasa-dev/galasa-mvp:test - name: Upload isolated.tar (MVP) for testing uses: actions/upload-artifact@v4 From 6a491935d4a2cc4b6ae4c94f5eed5da23683da85 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 4 Dec 2024 16:10:29 +0000 Subject: [PATCH 6/8] need to push pr images Signed-off-by: Jade Carino --- .github/workflows/pr-build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 496a345..9887fc9 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -214,8 +214,8 @@ jobs: with: context: . file: ${{ github.workspace }}/isolated/dockerfiles/dockerfile.isolated - load: true - tags: ghcr.io/galasa-dev/galasa-isolated:test + push: true + tags: ghcr.io/galasa-dev/galasa-isolated:${{ github.event.number }} build-args: | directory=isolated/full @@ -464,8 +464,8 @@ jobs: with: context: . file: ${{ github.workspace }}/isolated/dockerfiles/dockerfile.isolated - load: true - tags: ghcr.io/galasa-dev/galasa-mvp:test + push: true + tags: ghcr.io/galasa-dev/galasa-mvp:${{ github.event.number }} build-args: | directory=isolated/mvp From 9f7bfde51b17e044758c5c82824c14fe95eaea64 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 4 Dec 2024 16:19:48 +0000 Subject: [PATCH 7/8] Fix incorrect image tag Signed-off-by: Jade Carino --- .github/workflows/pr-build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 9887fc9..90a4ab8 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -221,8 +221,8 @@ jobs: - name: Build isolated.tar file (full isolated) run: | - docker pull ghcr.io/galasa-dev/galasa-isolated:test - docker save -o ${{ github.workspace }}/isolated/full/target/isolated/isolated.tar ghcr.io/galasa-dev/galasa-isolated:test + docker pull ghcr.io/galasa-dev/galasa-isolated:${{ github.event.number }} + docker save -o ${{ github.workspace }}/isolated/full/target/isolated/isolated.tar ghcr.io/galasa-dev/galasa-isolated:${{ github.event.number }} - name: Upload isolated.tar (full isolated) for inspection uses: actions/upload-artifact@v4 @@ -471,8 +471,8 @@ jobs: - name: Manually build isolated.tar (MVP) run: | - docker pull ghcr.io/galasa-dev/galasa-mvp:test - docker save -o ${{ github.workspace }}/isolated/mvp/target/isolated/isolated.tar ghcr.io/galasa-dev/galasa-mvp:test + docker pull ghcr.io/galasa-dev/galasa-mvp:${{ github.event.number }} + docker save -o ${{ github.workspace }}/isolated/mvp/target/isolated/isolated.tar ghcr.io/galasa-dev/galasa-mvp:${{ github.event.number }} - name: Upload isolated.tar (MVP) for testing uses: actions/upload-artifact@v4 From d8c4c60b32159a3c6a5501038603f31dd3a64f89 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 4 Dec 2024 16:30:05 +0000 Subject: [PATCH 8/8] ignore for prs for now Signed-off-by: Jade Carino --- .github/workflows/pr-build.yaml | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 90a4ab8..4dbd321 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -214,22 +214,11 @@ jobs: with: context: . file: ${{ github.workspace }}/isolated/dockerfiles/dockerfile.isolated - push: true - tags: ghcr.io/galasa-dev/galasa-isolated:${{ github.event.number }} + load: true + tags: galasa-isolated:test build-args: | directory=isolated/full - - name: Build isolated.tar file (full isolated) - run: | - docker pull ghcr.io/galasa-dev/galasa-isolated:${{ github.event.number }} - docker save -o ${{ github.workspace }}/isolated/full/target/isolated/isolated.tar ghcr.io/galasa-dev/galasa-isolated:${{ github.event.number }} - - - name: Upload isolated.tar (full isolated) for inspection - uses: actions/upload-artifact@v4 - with: - name: isolated.tar - path: ${{ github.workspace }}/isolated/full/target/isolated/isolated.tar - - name: Build Isolated zip with maven working-directory: ./isolated/full run: | @@ -464,22 +453,11 @@ jobs: with: context: . file: ${{ github.workspace }}/isolated/dockerfiles/dockerfile.isolated - push: true - tags: ghcr.io/galasa-dev/galasa-mvp:${{ github.event.number }} + load: true + tags: galasa-mvp:test build-args: | directory=isolated/mvp - - name: Manually build isolated.tar (MVP) - run: | - docker pull ghcr.io/galasa-dev/galasa-mvp:${{ github.event.number }} - docker save -o ${{ github.workspace }}/isolated/mvp/target/isolated/isolated.tar ghcr.io/galasa-dev/galasa-mvp:${{ github.event.number }} - - - name: Upload isolated.tar (MVP) for testing - uses: actions/upload-artifact@v4 - with: - name: mvp.tar - path: ${{ github.workspace }}/isolated/mvp/target/isolated/isolated.tar - - name: Build MVP zip with maven working-directory: ./isolated/mvp run: |