diff --git a/.github/workflows/payload-after-push-amd64.yaml b/.github/workflows/build-kata-static-tarball-amd64.yaml similarity index 57% rename from .github/workflows/payload-after-push-amd64.yaml rename to .github/workflows/build-kata-static-tarball-amd64.yaml index ef2f976eb7..1a14d145ec 100644 --- a/.github/workflows/payload-after-push-amd64.yaml +++ b/.github/workflows/build-kata-static-tarball-amd64.yaml @@ -1,9 +1,9 @@ -name: CI | Publish kata-deploy payload for amd64 +name: CI | Build kata-static tarball for amd64 on: workflow_call: inputs: - target-arch: - required: true + tarball-suffix: + required: false type: string jobs: @@ -23,13 +23,6 @@ jobs: - shim-v2 - virtiofsd steps: - - name: Login to Kata Containers quay.io - uses: docker/login-action@v2 - with: - registry: quay.io - username: ${{ secrets.QUAY_DEPLOYER_USERNAME }} - password: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} - - uses: actions/checkout@v3 with: fetch-depth: 0 # This is needed in order to keep the commit ids history @@ -47,7 +40,7 @@ jobs: - name: store-artifact ${{ matrix.asset }} uses: actions/upload-artifact@v3 with: - name: kata-artifacts-amd64 + name: kata-artifacts-amd64${{ inputs.tarball-suffix }} path: kata-build/kata-static-${{ matrix.asset }}.tar.xz retention-days: 1 if-no-files-found: error @@ -60,7 +53,7 @@ jobs: - name: get-artifacts uses: actions/download-artifact@v3 with: - name: kata-artifacts-amd64 + name: kata-artifacts-amd64${{ inputs.tarball-suffix }} path: kata-artifacts - name: merge-artifacts run: | @@ -68,31 +61,7 @@ jobs: - name: store-artifacts uses: actions/upload-artifact@v3 with: - name: kata-static-tarball-amd64 + name: kata-static-tarball-amd64${{ inputs.tarball-suffix }} path: kata-static.tar.xz retention-days: 1 if-no-files-found: error - - kata-payload: - needs: create-kata-tarball - runs-on: ubuntu-latest - steps: - - name: Login to Kata Containers quay.io - uses: docker/login-action@v2 - with: - registry: quay.io - username: ${{ secrets.QUAY_DEPLOYER_USERNAME }} - password: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} - - - uses: actions/checkout@v3 - - name: get-kata-tarball - uses: actions/download-artifact@v3 - with: - name: kata-static-tarball-amd64 - - - name: build-and-push-kata-payload - id: build-and-push-kata-payload - run: | - ./tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-payload.sh \ - $(pwd)/kata-static.tar.xz "quay.io/kata-containers/kata-deploy-ci" \ - "kata-containers-${{ inputs.target-arch }}" diff --git a/.github/workflows/payload-after-push-arm64.yaml b/.github/workflows/build-kata-static-tarball-arm64.yaml similarity index 58% rename from .github/workflows/payload-after-push-arm64.yaml rename to .github/workflows/build-kata-static-tarball-arm64.yaml index e25cd60f0c..f7b040b4a4 100644 --- a/.github/workflows/payload-after-push-arm64.yaml +++ b/.github/workflows/build-kata-static-tarball-arm64.yaml @@ -1,9 +1,9 @@ -name: CI | Publish kata-deploy payload for arm64 +name: CI | Build kata-static tarball for arm64 on: workflow_call: inputs: - target-arch: - required: true + tarball-suffix: + required: false type: string jobs: @@ -23,13 +23,6 @@ jobs: - shim-v2 - virtiofsd steps: - - name: Login to Kata Containers quay.io - uses: docker/login-action@v2 - with: - registry: quay.io - username: ${{ secrets.QUAY_DEPLOYER_USERNAME }} - password: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} - - name: Adjust a permission for repo run: | sudo chown -R $USER:$USER $GITHUB_WORKSPACE @@ -51,7 +44,7 @@ jobs: - name: store-artifact ${{ matrix.asset }} uses: actions/upload-artifact@v3 with: - name: kata-artifacts-arm64 + name: kata-artifacts-arm64${{ inputs.tarball-suffix }} path: kata-build/kata-static-${{ matrix.asset }}.tar.xz retention-days: 1 if-no-files-found: error @@ -68,7 +61,7 @@ jobs: - name: get-artifacts uses: actions/download-artifact@v3 with: - name: kata-artifacts-arm64 + name: kata-artifacts-arm64${{ inputs.tarball-suffix }} path: kata-artifacts - name: merge-artifacts run: | @@ -76,35 +69,7 @@ jobs: - name: store-artifacts uses: actions/upload-artifact@v3 with: - name: kata-static-tarball-arm64 + name: kata-static-tarball-arm64${{ inputs.tarball-suffix }} path: kata-static.tar.xz retention-days: 1 if-no-files-found: error - - kata-payload: - needs: create-kata-tarball - runs-on: arm64 - steps: - - name: Login to Kata Containers quay.io - uses: docker/login-action@v2 - with: - registry: quay.io - username: ${{ secrets.QUAY_DEPLOYER_USERNAME }} - password: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} - - - name: Adjust a permission for repo - run: | - sudo chown -R $USER:$USER $GITHUB_WORKSPACE - - - uses: actions/checkout@v3 - - name: get-kata-tarball - uses: actions/download-artifact@v3 - with: - name: kata-static-tarball-arm64 - - - name: build-and-push-kata-payload - id: build-and-push-kata-payload - run: | - ./tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-payload.sh \ - $(pwd)/kata-static.tar.xz "quay.io/kata-containers/kata-deploy-ci" \ - "kata-containers-${{ inputs.target-arch }}" diff --git a/.github/workflows/payload-after-push-s390x.yaml b/.github/workflows/build-kata-static-tarball-s390x.yaml similarity index 57% rename from .github/workflows/payload-after-push-s390x.yaml rename to .github/workflows/build-kata-static-tarball-s390x.yaml index df9afa9f9f..c00795fe30 100644 --- a/.github/workflows/payload-after-push-s390x.yaml +++ b/.github/workflows/build-kata-static-tarball-s390x.yaml @@ -1,9 +1,9 @@ -name: CI | Publish kata-deploy payload for s390x +name: CI | Build kata-static tarball for s390x on: workflow_call: inputs: - target-arch: - required: true + tarball-suffix: + required: false type: string jobs: @@ -19,13 +19,6 @@ jobs: - shim-v2 - virtiofsd steps: - - name: Login to Kata Containers quay.io - uses: docker/login-action@v2 - with: - registry: quay.io - username: ${{ secrets.QUAY_DEPLOYER_USERNAME }} - password: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} - - name: Adjust a permission for repo run: | sudo chown -R $USER:$USER $GITHUB_WORKSPACE @@ -48,7 +41,7 @@ jobs: - name: store-artifact ${{ matrix.asset }} uses: actions/upload-artifact@v3 with: - name: kata-artifacts-s390x + name: kata-artifacts-s390x${{ inputs.tarball-suffix }} path: kata-build/kata-static-${{ matrix.asset }}.tar.xz retention-days: 1 if-no-files-found: error @@ -65,7 +58,7 @@ jobs: - name: get-artifacts uses: actions/download-artifact@v3 with: - name: kata-artifacts-s390x + name: kata-artifacts-s390x${{ inputs.tarball-suffix }} path: kata-artifacts - name: merge-artifacts run: | @@ -73,35 +66,7 @@ jobs: - name: store-artifacts uses: actions/upload-artifact@v3 with: - name: kata-static-tarball-s390x + name: kata-static-tarball-s390x${{ inputs.tarball-suffix }} path: kata-static.tar.xz retention-days: 1 if-no-files-found: error - - kata-payload: - needs: create-kata-tarball - runs-on: s390x - steps: - - name: Login to Kata Containers quay.io - uses: docker/login-action@v2 - with: - registry: quay.io - username: ${{ secrets.QUAY_DEPLOYER_USERNAME }} - password: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} - - - name: Adjust a permission for repo - run: | - sudo chown -R $USER:$USER $GITHUB_WORKSPACE - - - uses: actions/checkout@v3 - - name: get-kata-tarball - uses: actions/download-artifact@v3 - with: - name: kata-static-tarball-s390x - - - name: build-and-push-kata-payload - id: build-and-push-kata-payload - run: | - ./tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-payload.sh \ - $(pwd)/kata-static.tar.xz "quay.io/kata-containers/kata-deploy-ci" \ - "kata-containers-${{ inputs.target-arch }}" diff --git a/.github/workflows/payload-after-push.yaml b/.github/workflows/payload-after-push.yaml index f07c8859c0..a03d4e543a 100644 --- a/.github/workflows/payload-after-push.yaml +++ b/.github/workflows/payload-after-push.yaml @@ -7,26 +7,41 @@ on: jobs: build-assets-amd64: - uses: ./.github/workflows/payload-after-push-amd64.yaml - with: - target-arch: amd64 - secrets: inherit + uses: ./.github/workflows/build-kata-static-tarball-amd64.yaml build-assets-arm64: - uses: ./.github/workflows/payload-after-push-arm64.yaml - with: - target-arch: arm64 - secrets: inherit + uses: ./.github/workflows/build-kata-static-tarball-arm64.yaml build-assets-s390x: - uses: ./.github/workflows/payload-after-push-s390x.yaml + uses: ./.github/workflows/build-kata-static-tarball-s390x.yaml + + publish-kata-deploy-payload-amd64: + needs: build-assets-amd64 + uses: ./.github/workflows/publish-kata-deploy-payload-amd64.yaml with: - target-arch: s390x + registry: quay.io/kata-containers/kata-deploy-ci + tag: kata-containers-amd64 secrets: inherit - publish: + publish-kata-deploy-payload-arm64: + needs: build-assets-arm64 + uses: ./.github/workflows/publish-kata-deploy-payload-arm64.yaml + with: + registry: quay.io/kata-containers/kata-deploy-ci + tag: kata-containers-arm64 + secrets: inherit + + publish-kata-deploy-payload-s390x: + needs: build-assets-s390x + uses: ./.github/workflows/publish-kata-deploy-payload-s390x.yaml + with: + registry: quay.io/kata-containers/kata-deploy-ci + tag: kata-containers-s390x + secrets: inherit + + publish-manifest: runs-on: ubuntu-latest - needs: [build-assets-amd64, build-assets-arm64, build-assets-s390x] + needs: [publish-kata-deploy-payload-amd64, publish-kata-deploy-payload-arm64, publish-kata-deploy-payload-s390x] steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/.github/workflows/publish-kata-deploy-payload-amd64.yaml b/.github/workflows/publish-kata-deploy-payload-amd64.yaml new file mode 100644 index 0000000000..27c0ade469 --- /dev/null +++ b/.github/workflows/publish-kata-deploy-payload-amd64.yaml @@ -0,0 +1,38 @@ +name: CI | Publish kata-deploy payload for amd64 +on: + workflow_call: + inputs: + tarball-suffix: + required: false + type: string + repo: + required: true + type: string + tag: + required: true + type: string + +jobs: + kata-payload: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: get-kata-tarball + uses: actions/download-artifact@v3 + with: + name: kata-static-tarball-amd64${{ inputs.tarball-suffix }} + + - name: Login to Kata Containers quay.io + uses: docker/login-action@v2 + with: + registry: quay.io + username: ${{ secrets.QUAY_DEPLOYER_USERNAME }} + password: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} + + - name: build-and-push-kata-payload + id: build-and-push-kata-payload + run: | + ./tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-payload.sh \ + $(pwd)/kata-static.tar.xz \ + quay.io/kata-containers/${{ inputs.repo }} ${{ inputs.tag }} diff --git a/.github/workflows/publish-kata-deploy-payload-arm64.yaml b/.github/workflows/publish-kata-deploy-payload-arm64.yaml new file mode 100644 index 0000000000..0834b7bf56 --- /dev/null +++ b/.github/workflows/publish-kata-deploy-payload-arm64.yaml @@ -0,0 +1,42 @@ +name: CI | Publish kata-deploy payload for arm64 +on: + workflow_call: + inputs: + tarball-suffix: + required: false + type: string + repo: + required: true + type: string + tag: + required: true + type: string + +jobs: + kata-payload: + runs-on: arm64 + steps: + - name: Adjust a permission for repo + run: | + sudo chown -R $USER:$USER $GITHUB_WORKSPACE + + - uses: actions/checkout@v3 + + - name: get-kata-tarball + uses: actions/download-artifact@v3 + with: + name: kata-static-tarball-arm64${{ inputs.tarball-suffix }} + + - name: Login to Kata Containers quay.io + uses: docker/login-action@v2 + with: + registry: quay.io + username: ${{ secrets.QUAY_DEPLOYER_USERNAME }} + password: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} + + - name: build-and-push-kata-payload + id: build-and-push-kata-payload + run: | + ./tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-payload.sh \ + $(pwd)/kata-static.tar.xz \ + quay.io/kata-containers/$${ inputs.repo }} ${{ inputs.tag }} diff --git a/.github/workflows/publish-kata-deploy-payload-s390x.yaml b/.github/workflows/publish-kata-deploy-payload-s390x.yaml new file mode 100644 index 0000000000..6c96df801d --- /dev/null +++ b/.github/workflows/publish-kata-deploy-payload-s390x.yaml @@ -0,0 +1,42 @@ +name: CI | Publish kata-deploy payload for s390x +on: + workflow_call: + inputs: + tarball-suffix: + required: false + type: string + registry: + repo: true + type: string + tag: + required: true + type: string + +jobs: + kata-payload: + runs-on: s390x + steps: + - name: Adjust a permission for repo + run: | + sudo chown -R $USER:$USER $GITHUB_WORKSPACE + + - uses: actions/checkout@v3 + + - name: get-kata-tarball + uses: actions/download-artifact@v3 + with: + name: kata-static-tarball-s390x${{ inputs.tarball-suffix }} + + - name: Login to Kata Containers quay.io + uses: docker/login-action@v2 + with: + registry: quay.io + username: ${{ secrets.QUAY_DEPLOYER_USERNAME }} + password: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} + + - name: build-and-push-kata-payload + id: build-and-push-kata-payload + run: | + ./tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-payload.sh \ + $(pwd)/kata-static.tar.xz \ + quay.io/kata-containers/${{ inputs.repo }} ${{ inputs.tag }}