Skip to content

Commit 0a0b5c5

Browse files
committed
Revert "Test patch for cross-compiler docker image"
This reverts commit 1626ab0. Signed-off-by: Gowtham Suresh Kumar <[email protected]>
1 parent 1626ab0 commit 0a0b5c5

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -180,21 +180,18 @@ jobs:
180180
needs: [build-and-export-cross-compile-docker]
181181
steps:
182182
- uses: actions/checkout@v3
183-
# - name: Load Docker
184-
# uses: ./.github/actions/load_docker
185-
# if: ${{ env.TEST_CROSS_DOCKER_IMAGE == 'parsec-service-test-cross-compile' }}
186-
# with:
187-
# image-name: "${{ env.TEST_CROSS_DOCKER_IMAGE }}"
188-
# image-path: "/tmp"
189-
# Use the following step when updating the `parsec-service-test-all` image
190-
- name: Build the container
191-
run: pushd e2e_tests/docker_image && docker build -t parsec-service-test-cross-compile -f parsec-service-test-cross-compile.Dockerfile . && popd
192-
- name: Run the cross compiler tests using pre-built docker image
183+
- name: Load Docker
184+
uses: ./.github/actions/load_docker
193185
if: ${{ env.TEST_CROSS_DOCKER_IMAGE == 'parsec-service-test-cross-compile' }}
194-
run: docker run -v $(pwd):/tmp/parsec -w /tmp/parsec -t parsec-service-test-cross-compile /tmp/parsec/test/cross-compile.sh
195-
- name: Run the cross compiler tests using image built on the CI
186+
with:
187+
image-name: "${{ env.TEST_CROSS_DOCKER_IMAGE }}"
188+
image-path: "/tmp"
189+
- name: Run the cross compiler tests using pre-built docker image
196190
if: ${{ env.TEST_CROSS_DOCKER_IMAGE != 'parsec-service-test-cross-compile' }}
197-
run: docker run -v $(pwd):/tmp/parsec -w /tmp/parsec -t parsec-service-test-cross-compile /tmp/parsec/test/cross-compile.sh
191+
run: docker run -v $(pwd):/tmp/parsec -w /tmp/parsec ghcr.io/parallaxsecond/parsec-service-test-cross-compile /tmp/parsec/test/cross-compile.sh
192+
- name: Run the cross compiler tests using image built on the CI
193+
if: ${{ env.TEST_CROSS_DOCKER_IMAGE == 'parsec-service-test-cross-compile' }}
194+
run: docker run -v $(pwd):/tmp/parsec -w "${{ env.TEST_CROSS_DOCKER_IMAGE }}" /tmp/parsec/test/cross-compile.sh
198195

199196
links:
200197
name: Check links

0 commit comments

Comments
 (0)