Skip to content

Commit

Permalink
Fix for the Zephyr CI tests (open-quantum-safe#1714)
Browse files Browse the repository at this point in the history
Create only a minimal Zephyr installation to run CI tests and increase timeout of the Signature test.

Signed-off-by: Tobias Frauenschläger <t.frauenschlaeger@me.com>
Signed-off-by: Eddy Kim <Eddy.M.Kim@outlook.com>
  • Loading branch information
Frauschi authored and Eddy-M-K committed Apr 5, 2024
1 parent 1b92332 commit 42e1742
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 14 deletions.
38 changes: 25 additions & 13 deletions .github/workflows/zephyr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,35 @@ jobs:
- zephyr-ref: v3.5.0

steps:
- name: Init west workspace
run: west init --mr ${{ matrix.config.zephyr-ref }} zephyr

- name: Update west.yml
working-directory: zephyr/zephyr
- name: Init Zephyr workspace
run: |
REF=$(echo '${{ github.ref }}' | sed -e 's/\//\\\//g')
sed -e 's/remotes:/remotes:\n \- name: liboqs\n url\-base: https:\/\/github.com\/${{ github.repository_owner }}/' -i west.yml
sed -e "s/projects:/projects:\n \- name: liboqs\n path: modules\/crypto\/liboqs\n remote: liboqs\n revision: $REF/" -i west.yml
mkdir zephyr && cd zephyr
mkdir manifest && cd manifest
echo "manifest:" > west.yml
echo " remotes:" >> west.yml
echo " - name: zephyr" >> west.yml
echo " url-base: https://github.com/zephyrproject-rtos" >> west.yml
echo " - name: liboqs" >> west.yml
echo " url-base: https://github.com/${{ github.repository_owner }}" >> west.yml
echo " projects:" >> west.yml
echo " - name: zephyr" >> west.yml
echo " remote: zephyr" >> west.yml
echo " repo-path: zephyr" >> west.yml
echo " revision: ${{ matrix.config.zephyr-ref }}" >> west.yml
echo " import:" >> west.yml
echo " name-allowlist:" >> west.yml
echo " - picolibc" >> west.yml
echo " - name: liboqs" >> west.yml
echo " remote: liboqs" >> west.yml
echo " revision: $(echo '${{ github.ref }}' | sed -e 's/refs\/heads\///')" >> west.yml
echo " path: modules/crypto/liboqs" >> west.yml
west init -l --mf west.yml .
- name: Update west workspace
working-directory: zephyr
run: west update -n -o=--depth=1

- name: Export zephyr
working-directory: zephyr
run: west zephyr-export
run: |
west update -n -o=--depth=1
west zephyr-export
- name: Run Signature test
working-directory: zephyr
Expand Down
2 changes: 1 addition & 1 deletion zephyr/samples/Signatures/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ common:

tests:
sample.crypto.liboqs_signature_example:
timeout: 600
timeout: 900
integration_platforms:
- qemu_x86
- qemu_cortex_a53
Expand Down

0 comments on commit 42e1742

Please sign in to comment.