From 0418a146162a6c8fa04071becbaa77b871fcf142 Mon Sep 17 00:00:00 2001 From: Asutosh Panda <136367735+asutosh23@users.noreply.github.com> Date: Wed, 1 Oct 2025 13:02:35 +0530 Subject: [PATCH 1/7] test ubuntu-latest --- .github/workflows/ci.yml | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ffcd6719..44062b6c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,27 +1,31 @@ name: RIT Action Continuous Integration Test -on: - pull_request: - push: - branches: - - main - workflow_dispatch: - inputs: - rskj-branch: - description: 'Branch for RSKj' - required: false - default: 'master' - powpeg-branch: - description: 'Branch for PowPeg Node' - required: false - default: 'master' +on: pull_request + +# on: +# pull_request: +# push: +# branches: +# - main +# workflow_dispatch: +# inputs: +# rskj-branch: +# description: 'Branch for RSKj' +# required: false +# default: 'master' +# powpeg-branch: +# description: 'Branch for PowPeg Node' +# required: false +# default: 'master' permissions: contents: read env: - TEST_TAG: ${{ github.event.repository.name }}/rit:test - LATEST_TAG: ghcr.io/rsksmart/${{ github.event.repository.name }}/rit + TEST_TAG: tenkicloud/rit:test + LATEST_TAG: ghcr.io/rsksmart/tenkicloud/rit + # TEST_TAG: ${{ github.event.repository.name }}/rit:test + # LATEST_TAG: ghcr.io/rsksmart/${{ github.event.repository.name }}/rit jobs: build-push-rit-action-container-action: @@ -99,7 +103,7 @@ jobs: push: true test-rit-action: - if: ${{ github.ref == 'refs/heads/main' }} + # if: ${{ github.ref == 'refs/heads/main' }} needs: build-push-rit-action-container-action name: GitHub Actions Test runs-on: ubuntu-latest From 1e32cd597e2776c14967b9525190ae38cc8a8555 Mon Sep 17 00:00:00 2001 From: Asutosh Panda <136367735+asutosh23@users.noreply.github.com> Date: Wed, 1 Oct 2025 13:27:48 +0530 Subject: [PATCH 2/7] bypass conditions --- .github/workflows/ci.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44062b6c..6b2fca62 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,7 @@ permissions: env: TEST_TAG: tenkicloud/rit:test LATEST_TAG: ghcr.io/rsksmart/tenkicloud/rit + RIT_BRANCH: main # TEST_TAG: ${{ github.event.repository.name }}/rit:test # LATEST_TAG: ghcr.io/rsksmart/${{ github.event.repository.name }}/rit @@ -82,16 +83,17 @@ jobs: --env INPUT_RSKJ_BRANCH="${{ env.RSKJ_BRANCH }}" \ --env INPUT_POWPEG_NODE_BRANCH="${{ env.POWPEG_BRANCH }}" \ --env INPUT_RIT_BRANCH="${{ env.RIT_BRANCH }}" \ + # --env INPUT_RIT_BRANCH="${{ env.RIT_BRANCH }}" \ --env INPUT_RIT_LOG_LEVEL="${{ env.INPUT_RIT_LOG_LEVEL }}" \ -v "$GITHUB_OUTPUT:/github-output" \ --rm ${{ env.TEST_TAG }} - - name: GitHub container registry login - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + # - name: GitHub container registry login + # uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 + # with: + # registry: ghcr.io + # username: ${{ github.repository_owner }} + # password: ${{ secrets.GITHUB_TOKEN }} - name: Build the RIT Action Container Image uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0 @@ -100,7 +102,7 @@ jobs: tags: ${{ env.LATEST_TAG }} labels: ${{ steps.meta.outputs.labels }} load: true - push: true + push: false test-rit-action: # if: ${{ github.ref == 'refs/heads/main' }} From 17389aa3f5c606deb9b1e4afdab0a631bb545e34 Mon Sep 17 00:00:00 2001 From: Asutosh Panda <136367735+asutosh23@users.noreply.github.com> Date: Wed, 1 Oct 2025 13:37:30 +0530 Subject: [PATCH 3/7] bypass conditions --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b2fca62..69c9b2b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,7 +83,6 @@ jobs: --env INPUT_RSKJ_BRANCH="${{ env.RSKJ_BRANCH }}" \ --env INPUT_POWPEG_NODE_BRANCH="${{ env.POWPEG_BRANCH }}" \ --env INPUT_RIT_BRANCH="${{ env.RIT_BRANCH }}" \ - # --env INPUT_RIT_BRANCH="${{ env.RIT_BRANCH }}" \ --env INPUT_RIT_LOG_LEVEL="${{ env.INPUT_RIT_LOG_LEVEL }}" \ -v "$GITHUB_OUTPUT:/github-output" \ --rm ${{ env.TEST_TAG }} From b6310d85fc6f15bf043402b650b3f2533d3d1849 Mon Sep 17 00:00:00 2001 From: Asutosh Panda <136367735+asutosh23@users.noreply.github.com> Date: Wed, 1 Oct 2025 13:50:33 +0530 Subject: [PATCH 4/7] bypass conditions --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69c9b2b8..87931258 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,8 @@ jobs: env: INPUT_RSKJ_BRANCH: ${{ env.RSKJ_BRANCH }} INPUT_POWPEG_NODE_BRANCH: ${{ env.POWPEG_BRANCH }} - INPUT_RIT_BRANCH: ${{ env.RIT_BRANCH }} + INPUT_RIT_BRANCH: main + # INPUT_RIT_BRANCH: ${{ env.RIT_BRANCH }} INPUT_RIT_LOG_LEVEL: info run: | docker run \ @@ -127,7 +128,8 @@ jobs: with: rskj-branch: ${{ env.RSKJ_BRANCH }} powpeg-node-branch: ${{ env.POWPEG_BRANCH }} - rit-branch: ${{ env.RIT_BRANCH }} + rit-branch: main + # rit-branch: ${{ env.RIT_BRANCH }} - name: Print RIT Status and Message id: output From ac8915fce0bc92190e3f7ca2b47cc9f86fe064e0 Mon Sep 17 00:00:00 2001 From: Asutosh Panda <136367735+asutosh23@users.noreply.github.com> Date: Wed, 1 Oct 2025 13:58:40 +0530 Subject: [PATCH 5/7] bypass conditions --- container-action/entrypoint.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/container-action/entrypoint.sh b/container-action/entrypoint.sh index b0e9c20c..f6abf910 100644 --- a/container-action/entrypoint.sh +++ b/container-action/entrypoint.sh @@ -6,7 +6,8 @@ set -e RSKJ_BRANCH="${INPUT_RSKJ_BRANCH}" POWPEG_NODE_BRANCH="${INPUT_POWPEG_NODE_BRANCH}" -RIT_BRANCH="${INPUT_RIT_BRANCH}" +RIT_BRANCH=main +# RIT_BRANCH="${INPUT_RIT_BRANCH}" LOG_LEVEL="${INPUT_RIT_LOG_LEVEL}" REPO_OWNER="${INPUT_REPO_OWNER:-rsksmart}" # Default to 'rsksmart' if not provided IS_RSKJ_BRANCH=$(curl -s -o /dev/null -w "%{http_code}" "https://api.github.com/repos/$REPO_OWNER/rskj/branches/$RSKJ_BRANCH") From 61ebc1278379bd9883f83baf3b2a5db2cfdce174 Mon Sep 17 00:00:00 2001 From: Asutosh Panda <136367735+asutosh23@users.noreply.github.com> Date: Wed, 1 Oct 2025 21:48:43 +0530 Subject: [PATCH 6/7] test tenki-standard-autoscale --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87931258..cb0ddfce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ env: jobs: build-push-rit-action-container-action: name: Test RIT Action docker container-action - runs-on: ubuntu-latest + runs-on: tenki-standard-autoscale timeout-minutes: 150 permissions: packages: write @@ -108,7 +108,7 @@ jobs: # if: ${{ github.ref == 'refs/heads/main' }} needs: build-push-rit-action-container-action name: GitHub Actions Test - runs-on: ubuntu-latest + runs-on: tenki-standard-autoscale timeout-minutes: 150 steps: From 45a8651715fe2a1a711918d2e1f629a913713d70 Mon Sep 17 00:00:00 2001 From: Asutosh Panda <136367735+asutosh23@users.noreply.github.com> Date: Fri, 3 Oct 2025 16:52:35 +0000 Subject: [PATCH 7/7] ci: keep PR merge ready for tenki runner --- .github/workflows/ci.yml | 63 +++++++++++++++------------------- container-action/entrypoint.sh | 3 +- 2 files changed, 29 insertions(+), 37 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb0ddfce..6c9fc9ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,32 +1,27 @@ name: RIT Action Continuous Integration Test -on: pull_request - -# on: -# pull_request: -# push: -# branches: -# - main -# workflow_dispatch: -# inputs: -# rskj-branch: -# description: 'Branch for RSKj' -# required: false -# default: 'master' -# powpeg-branch: -# description: 'Branch for PowPeg Node' -# required: false -# default: 'master' +on: + pull_request: + push: + branches: + - main + workflow_dispatch: + inputs: + rskj-branch: + description: 'Branch for RSKj' + required: false + default: 'master' + powpeg-branch: + description: 'Branch for PowPeg Node' + required: false + default: 'master' permissions: contents: read env: - TEST_TAG: tenkicloud/rit:test - LATEST_TAG: ghcr.io/rsksmart/tenkicloud/rit - RIT_BRANCH: main - # TEST_TAG: ${{ github.event.repository.name }}/rit:test - # LATEST_TAG: ghcr.io/rsksmart/${{ github.event.repository.name }}/rit + TEST_TAG: ${{ github.event.repository.name }}/rit:test + LATEST_TAG: ghcr.io/rsksmart/${{ github.event.repository.name }}/rit jobs: build-push-rit-action-container-action: @@ -43,7 +38,7 @@ jobs: - name: Docker meta id: meta - uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0 + uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0 with: images: | ${{ env.LATEST_TAG }} @@ -75,8 +70,7 @@ jobs: env: INPUT_RSKJ_BRANCH: ${{ env.RSKJ_BRANCH }} INPUT_POWPEG_NODE_BRANCH: ${{ env.POWPEG_BRANCH }} - INPUT_RIT_BRANCH: main - # INPUT_RIT_BRANCH: ${{ env.RIT_BRANCH }} + INPUT_RIT_BRANCH: ${{ env.RIT_BRANCH }} INPUT_RIT_LOG_LEVEL: info run: | docker run \ @@ -88,12 +82,12 @@ jobs: -v "$GITHUB_OUTPUT:/github-output" \ --rm ${{ env.TEST_TAG }} - # - name: GitHub container registry login - # uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 - # with: - # registry: ghcr.io - # username: ${{ github.repository_owner }} - # password: ${{ secrets.GITHUB_TOKEN }} + - name: GitHub container registry login + uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build the RIT Action Container Image uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0 @@ -102,10 +96,10 @@ jobs: tags: ${{ env.LATEST_TAG }} labels: ${{ steps.meta.outputs.labels }} load: true - push: false + push: true test-rit-action: - # if: ${{ github.ref == 'refs/heads/main' }} + if: ${{ github.ref == 'refs/heads/main' }} needs: build-push-rit-action-container-action name: GitHub Actions Test runs-on: tenki-standard-autoscale @@ -128,8 +122,7 @@ jobs: with: rskj-branch: ${{ env.RSKJ_BRANCH }} powpeg-node-branch: ${{ env.POWPEG_BRANCH }} - rit-branch: main - # rit-branch: ${{ env.RIT_BRANCH }} + rit-branch: ${{ env.RIT_BRANCH }} - name: Print RIT Status and Message id: output diff --git a/container-action/entrypoint.sh b/container-action/entrypoint.sh index f6abf910..b0e9c20c 100644 --- a/container-action/entrypoint.sh +++ b/container-action/entrypoint.sh @@ -6,8 +6,7 @@ set -e RSKJ_BRANCH="${INPUT_RSKJ_BRANCH}" POWPEG_NODE_BRANCH="${INPUT_POWPEG_NODE_BRANCH}" -RIT_BRANCH=main -# RIT_BRANCH="${INPUT_RIT_BRANCH}" +RIT_BRANCH="${INPUT_RIT_BRANCH}" LOG_LEVEL="${INPUT_RIT_LOG_LEVEL}" REPO_OWNER="${INPUT_REPO_OWNER:-rsksmart}" # Default to 'rsksmart' if not provided IS_RSKJ_BRANCH=$(curl -s -o /dev/null -w "%{http_code}" "https://api.github.com/repos/$REPO_OWNER/rskj/branches/$RSKJ_BRANCH")