From fdde43e833bc2efdc7b8447d406d1a14ea825d7b Mon Sep 17 00:00:00 2001 From: fmacleal Date: Fri, 19 Jul 2024 19:59:55 +0200 Subject: [PATCH] Fixing inputs on the test step --- .github/workflows/ci.yml | 12 ++++++------ {.github/image => container-action}/Dockerfile | 0 {.github => container-action}/README.md | 2 +- {.github => container-action}/action.yml | 2 +- {.github/image => container-action}/entrypoint.sh | 4 ++-- .../rit-local-configs/logbacks/logback-fed-1.xml | 0 .../rit-local-configs/logbacks/logback-fed-2.xml | 0 .../rit-local-configs/logbacks/logback-fed-3.xml | 0 .../rit-local-configs/logbacks/logback-fed-4.xml | 0 .../rit-local-configs/logbacks/logback-fed-5.xml | 0 .../rit-local-configs/regtest-all-keys.js | 0 .../scripts/configure_gradle_powpeg.sh | 0 .../scripts/configure_rit_locally.sh | 0 13 files changed, 10 insertions(+), 10 deletions(-) rename {.github/image => container-action}/Dockerfile (100%) rename {.github => container-action}/README.md (97%) rename {.github => container-action}/action.yml (97%) rename {.github/image => container-action}/entrypoint.sh (96%) rename {.github/image => container-action}/rit-local-configs/logbacks/logback-fed-1.xml (100%) rename {.github/image => container-action}/rit-local-configs/logbacks/logback-fed-2.xml (100%) rename {.github/image => container-action}/rit-local-configs/logbacks/logback-fed-3.xml (100%) rename {.github/image => container-action}/rit-local-configs/logbacks/logback-fed-4.xml (100%) rename {.github/image => container-action}/rit-local-configs/logbacks/logback-fed-5.xml (100%) rename {.github/image => container-action}/rit-local-configs/regtest-all-keys.js (100%) rename {.github/image => container-action}/scripts/configure_gradle_powpeg.sh (100%) rename {.github/image => container-action}/scripts/configure_rit_locally.sh (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 494627d3..d5871c28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,8 +14,8 @@ env: LATEST_TAG: ghcr.io/rsksmart/${{ github.event.repository.name }}/rit jobs: - build-push-rit-action-image: - name: Test RIT Action docker image + build-push-rit-action-container-action: + name: Test RIT Action docker container-action runs-on: ubuntu-latest timeout-minutes: 60 @@ -43,7 +43,7 @@ jobs: - name: Build and export locally Docker uses: docker/build-push-action@v6 with: - context: .github/image + context: container-action/ load: true tags: ${{ env.TEST_TAG }} @@ -74,14 +74,14 @@ jobs: - name: Build the RIT Action Container Image uses: docker/build-push-action@v6 with: - context: .github/image + context: container-action/ tags: ${{ env.LATEST_TAG }} labels: ${{ steps.meta.outputs.labels }} load: true push: true test-rit-action: - needs: build-push-rit-action-image + needs: build-push-rit-action-container-action name: GitHub Actions Test runs-on: ubuntu-latest timeout-minutes: 60 @@ -93,7 +93,7 @@ jobs: - name: Test RIT Action id: test-rit-action - uses: .github/ + uses: ./container-action/ with: rskj-branch: master powpeg-node-branch: master diff --git a/.github/image/Dockerfile b/container-action/Dockerfile similarity index 100% rename from .github/image/Dockerfile rename to container-action/Dockerfile diff --git a/.github/README.md b/container-action/README.md similarity index 97% rename from .github/README.md rename to container-action/README.md index a52eada6..16d6fb04 100644 --- a/.github/README.md +++ b/container-action/README.md @@ -51,7 +51,7 @@ The output message of the integration tests. It will be: ## Example usage ```yaml -uses: docker://ghcr.io/rsksmart/rootstock-integration-tests/rit:latest +uses: rootstock-integration-tests@v1 with: rskj-branch: master powpeg-node-branch: master diff --git a/.github/action.yml b/container-action/action.yml similarity index 97% rename from .github/action.yml rename to container-action/action.yml index 298ca755..657b65ea 100644 --- a/.github/action.yml +++ b/container-action/action.yml @@ -28,7 +28,7 @@ outputs: runs: using: docker - image: ./images/Dockerfile + image: Dockerfile env: INPUT_RSKJ_BRANCH: ${{ inputs.rskj-branch }} INPUT_POWPEG_NODE_BRANCH: ${{ inputs.powpeg-node-branch }} diff --git a/.github/image/entrypoint.sh b/container-action/entrypoint.sh similarity index 96% rename from .github/image/entrypoint.sh rename to container-action/entrypoint.sh index b9a1c551..1003f44d 100644 --- a/.github/image/entrypoint.sh +++ b/container-action/entrypoint.sh @@ -28,7 +28,7 @@ chmod +x ./configure.sh && chmod +x gradlew POWPEG_VERSION=$(bash configure_gradle_powpeg.sh) echo "POWPEG_VERSION=$POWPEG_VERSION" ./configure.sh -#./gradlew --info --no-daemon clean build -x test +./gradlew --info --no-daemon clean build -x test echo -e "\n\n--------- Starting the configuration of RIT ---------\n\n" cd /usr/src/ @@ -45,7 +45,7 @@ export LOG_LEVEL="$LOG_LEVEL" echo -e "\n\n--------- Executing Rootstock Integration Tests ---------\n\n" npm install -y -#npm run test-fail-fast +npm run test-fail-fast STATUS=$? echo -e "\n\n--------- RIT Tests Result ---------\n\n" diff --git a/.github/image/rit-local-configs/logbacks/logback-fed-1.xml b/container-action/rit-local-configs/logbacks/logback-fed-1.xml similarity index 100% rename from .github/image/rit-local-configs/logbacks/logback-fed-1.xml rename to container-action/rit-local-configs/logbacks/logback-fed-1.xml diff --git a/.github/image/rit-local-configs/logbacks/logback-fed-2.xml b/container-action/rit-local-configs/logbacks/logback-fed-2.xml similarity index 100% rename from .github/image/rit-local-configs/logbacks/logback-fed-2.xml rename to container-action/rit-local-configs/logbacks/logback-fed-2.xml diff --git a/.github/image/rit-local-configs/logbacks/logback-fed-3.xml b/container-action/rit-local-configs/logbacks/logback-fed-3.xml similarity index 100% rename from .github/image/rit-local-configs/logbacks/logback-fed-3.xml rename to container-action/rit-local-configs/logbacks/logback-fed-3.xml diff --git a/.github/image/rit-local-configs/logbacks/logback-fed-4.xml b/container-action/rit-local-configs/logbacks/logback-fed-4.xml similarity index 100% rename from .github/image/rit-local-configs/logbacks/logback-fed-4.xml rename to container-action/rit-local-configs/logbacks/logback-fed-4.xml diff --git a/.github/image/rit-local-configs/logbacks/logback-fed-5.xml b/container-action/rit-local-configs/logbacks/logback-fed-5.xml similarity index 100% rename from .github/image/rit-local-configs/logbacks/logback-fed-5.xml rename to container-action/rit-local-configs/logbacks/logback-fed-5.xml diff --git a/.github/image/rit-local-configs/regtest-all-keys.js b/container-action/rit-local-configs/regtest-all-keys.js similarity index 100% rename from .github/image/rit-local-configs/regtest-all-keys.js rename to container-action/rit-local-configs/regtest-all-keys.js diff --git a/.github/image/scripts/configure_gradle_powpeg.sh b/container-action/scripts/configure_gradle_powpeg.sh similarity index 100% rename from .github/image/scripts/configure_gradle_powpeg.sh rename to container-action/scripts/configure_gradle_powpeg.sh diff --git a/.github/image/scripts/configure_rit_locally.sh b/container-action/scripts/configure_rit_locally.sh similarity index 100% rename from .github/image/scripts/configure_rit_locally.sh rename to container-action/scripts/configure_rit_locally.sh