Skip to content

Commit dcdedfd

Browse files
committed
Test patch for running CI on new docker image
Signed-off-by: Gowtham Suresh Kumar <[email protected]>
1 parent b17a224 commit dcdedfd

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

.github/workflows/ci.yml

+14-6
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: Continuous Integration
33
on: [push, pull_request, workflow_dispatch]
44

55
env:
6-
# TEST_ALL_DOCKER_IMAGE: 'parsec-service-test-all'
7-
TEST_ALL_DOCKER_IMAGE: 'ghcr.io/parallaxsecond/parsec-service-test-all'
6+
TEST_ALL_DOCKER_IMAGE: 'parsec-service-test-all'
7+
#TEST_ALL_DOCKER_IMAGE: 'ghcr.io/parallaxsecond/parsec-service-test-all'
88

99
jobs:
1010
build-and-export-test-all-docker:
@@ -13,7 +13,7 @@ jobs:
1313
# the following condition must evaluate true to execute this job
1414
# Else it must evaluate false to NOT execute this job
1515
# Unfortunately, env.TEST_ALL_DOCKER_IMAGE cannot be used here as the `env` context is not recognized at this level.
16-
if: ${{ false }} # env.TEST_ALL_DOCKER_IMAGE == 'parsec-service-test-all'
16+
if: ${{ true }} # env.TEST_ALL_DOCKER_IMAGE == 'parsec-service-test-all'
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Build the docker container
@@ -180,13 +180,21 @@ jobs:
180180
# Currently only the Mbed Crypto, PKCS 11, and TPM providers are tested as the other ones need to cross-compile other libraries.
181181
name: Cross-compile Parsec to various targets
182182
runs-on: ubuntu-latest
183+
needs: [build-and-export-test-all-docker]
183184
steps:
184185
- uses: actions/checkout@v2
186+
- name: Load Docker
187+
uses: ./.github/actions/load_docker
188+
if: ${{ env.TEST_ALL_DOCKER_IMAGE == 'parsec-service-test-all' }}
189+
with:
190+
image-name: "${{ env.TEST_ALL_DOCKER_IMAGE }}"
191+
image-path: "/tmp"
185192
- name: Run the container to execute the test script
186-
run:
187-
docker run -v $(pwd):/tmp/parsec -w /tmp/parsec ghcr.io/parallaxsecond/parsec-service-test-cross-compile /tmp/parsec/test/cross-compile.sh
193+
#run:
194+
#docker run -v $(pwd):/tmp/parsec -w /tmp/parsec ghcr.io/parallaxsecond/parsec-service-test-cross-compile /tmp/parsec/test/cross-compile.sh
188195
# When running the container built on the CI
189-
# run: docker run -v $(pwd):/tmp/parsec -w /tmp/parsec -t parsec-service-test-cross-compile /tmp/parsec/test/cross-compile.sh
196+
run: pushd e2e_tests/docker_image && docker build -t parsec-service-test-cross-compile -f parsec-service-test-cross-compile.Dockerfile . && popd
197+
run: docker run -v $(pwd):/tmp/parsec -w /tmp/parsec -t parsec-service-test-cross-compile /tmp/parsec/test/cross-compile.sh
190198

191199
links:
192200
name: Check links

e2e_tests/docker_image/parsec-service-test-cross-compile.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright 2021 Contributors to the Parsec project.
22
# SPDX-License-Identifier: Apache-2.0
3-
FROM ghcr.io/parallaxsecond/parsec-service-test-all
3+
FROM parsec-service-test-all
44

55
# Install aarch64-none-linux-gnu cross compilation toolchain
66
RUN wget https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz?revision=61c3be5d-5175-4db6-9030-b565aae9f766 -O aarch64-gcc.tar.xz

0 commit comments

Comments
 (0)