From 7f970da2798c510520824870f2c8cedc563a6bfc Mon Sep 17 00:00:00 2001 From: Erik Heeren Date: Mon, 7 Oct 2024 11:57:10 +0200 Subject: [PATCH] Hardcoded attempt to run on runtime image --- .github/workflows/spacktainer.yaml | 95 +++++++++++++++--------------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/.github/workflows/spacktainer.yaml b/.github/workflows/spacktainer.yaml index 3dadde7..ec56096 100644 --- a/.github/workflows/spacktainer.yaml +++ b/.github/workflows/spacktainer.yaml @@ -2,52 +2,52 @@ name: Build Spacktainers on: [push] jobs: - base-container-job: - runs-on: - - codebuild-spacktainers-${{ github.run_id }}-${{ github.run_attempt }} - - image:ubuntu-7.0 - - instance-size:small - steps: - - name: clone repo - uses: actions/checkout@v4 - - name: create builder - uses: ./.github/actions/build_base_container - with: - AWS_ECR_URL: ${{ secrets.AWS_ECR_URL }} - AWS_ECR_PATH: /spacktainers/builder - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }} - BUILD_PATH: builder - BUILDAH_EXTRA_ARGS: --label org.opencontainers.image.revision="$GITHUB_SHA" - --label org.opencontainers.image.authors="$GITHUB_TRIGGERING_ACTOR" --label - org.opencontainers.image.url="https://github.com/${GITHUB_REPOSITORY}" - --label org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}" - --label ch.epfl.bbpgitlab.ci-pipeline-url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" - --label ch.epfl.bbpgitlab.ci-commit-branch="$GITHUB_REF_NAME" --build-arg - SPACK_BRANCH=develop - # ' --label org.opencontainers.image.created="$CI_JOB_STARTED_AT"' - DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - SPACK_DEPLOYMENT_KEY_PUB: ${{ secrets.SPACK_DEPLOYMENT_KEY_PUB }} - - name: create runtime - uses: ./.github/actions/build_base_container - with: - AWS_ECR_URL: ${{ secrets.AWS_ECR_URL }} - AWS_ECR_PATH: /spacktainers/runtime - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }} - BUILD_PATH: runtime - BUILDAH_EXTRA_ARGS: --label org.opencontainers.image.revision="$GITHUB_SHA" - --label org.opencontainers.image.authors="$GITHUB_TRIGGERING_ACTOR" --label - org.opencontainers.image.url="https://github.com/${GITHUB_REPOSITORY}" - --label org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}" - --label ch.epfl.bbpgitlab.ci-pipeline-url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" - --label ch.epfl.bbpgitlab.ci-commit-branch="$GITHUB_REF_NAME" --build-arg - SPACK_BRANCH=develop - # ' --label org.opencontainers.image.created="$CI_JOB_STARTED_AT"' - DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - SPACK_DEPLOYMENT_KEY_PUB: ${{ secrets.SPACK_DEPLOYMENT_KEY_PUB }} + # base-container-job: + # runs-on: + # - codebuild-spacktainers-${{ github.run_id }}-${{ github.run_attempt }} + # - image:ubuntu-7.0 + # - instance-size:small + # steps: + # - name: clone repo + # uses: actions/checkout@v4 + # - name: create builder + # uses: ./.github/actions/build_base_container + # with: + # AWS_ECR_URL: ${{ secrets.AWS_ECR_URL }} + # AWS_ECR_PATH: /spacktainers/builder + # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }} + # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }} + # BUILD_PATH: builder + # BUILDAH_EXTRA_ARGS: --label org.opencontainers.image.revision="$GITHUB_SHA" + # --label org.opencontainers.image.authors="$GITHUB_TRIGGERING_ACTOR" --label + # org.opencontainers.image.url="https://github.com/${GITHUB_REPOSITORY}" + # --label org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}" + # --label ch.epfl.bbpgitlab.ci-pipeline-url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" + # --label ch.epfl.bbpgitlab.ci-commit-branch="$GITHUB_REF_NAME" --build-arg + # SPACK_BRANCH=develop + # # ' --label org.opencontainers.image.created="$CI_JOB_STARTED_AT"' + # DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} + # DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} + # SPACK_DEPLOYMENT_KEY_PUB: ${{ secrets.SPACK_DEPLOYMENT_KEY_PUB }} + # - name: create runtime + # uses: ./.github/actions/build_base_container + # with: + # AWS_ECR_URL: ${{ secrets.AWS_ECR_URL }} + # AWS_ECR_PATH: /spacktainers/runtime + # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }} + # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }} + # BUILD_PATH: runtime + # BUILDAH_EXTRA_ARGS: --label org.opencontainers.image.revision="$GITHUB_SHA" + # --label org.opencontainers.image.authors="$GITHUB_TRIGGERING_ACTOR" --label + # org.opencontainers.image.url="https://github.com/${GITHUB_REPOSITORY}" + # --label org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}" + # --label ch.epfl.bbpgitlab.ci-pipeline-url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" + # --label ch.epfl.bbpgitlab.ci-commit-branch="$GITHUB_REF_NAME" --build-arg + # SPACK_BRANCH=develop + # # ' --label org.opencontainers.image.created="$CI_JOB_STARTED_AT"' + # DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} + # DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} + # SPACK_DEPLOYMENT_KEY_PUB: ${{ secrets.SPACK_DEPLOYMENT_KEY_PUB }} get-builder-image: runs-on: ubuntu-latest env: @@ -61,7 +61,8 @@ jobs: spacktainer-build-job: runs-on: - codebuild-spacktainers-${{ github.run_id }}-${{ github.run_attempt }} - - image:${{ needs.get-builder-image.outputs.builder }} + # - image:${{ needs.get-builder-image.outputs.builder }} + - image:LINUX_IMAGE-130659266700.dkr.ecr.us-east-1.amazonaws.com/spacktainers/runtime:latest - instance-size:small needs: [base-container-job, get-builder-image] steps: