ci: split gitlab configuration files and store them in a 'ci' folder

The core/build-docker.sh si broken, but so it was already in master and is tracked to be fixed in #108.
2024-11-22 07:28:10 +00:00 · 2019-04-27 19:16:50 +02:00 · 2019-04-27 19:16:50 +02:00 · 7c58d7d24e
commit 7c58d7d24e
parent 597b9fabd1
10 changed files with 181 additions and 170 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -17,174 +17,14 @@ stages:
  - build
  - test

-environment:
-  stage: environment
-  image: docker:latest
-  variables:
-    CONTAINER_NAME: "$CI_REGISTRY/trezor/trezor-firmware/environment"
-  services:
-    - docker:dind
-  before_script:
-    - docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
-  when: manual
-  script:
-    - docker pull $CONTAINER_NAME:latest || true
-    - docker build --cache-from $CONTAINER_NAME:latest --tag $CONTAINER_NAME:$CI_COMMIT_SHA --tag $CONTAINER_NAME:latest .
-    - docker push $CONTAINER_NAME:$CI_COMMIT_SHA
-    - docker push $CONTAINER_NAME:latest
-
-image: registry.corp.sldev.cz/trezor/trezor-firmware/environment
-
 before_script:
  - pipenv install

-prebuild style:
-  stage: prebuild
-  script:
-    - pipenv run make style_check
-    - cd core && pipenv run make templates_check  # TODO
-
-prebuild common:
-  stage: prebuild
-  script:
-    - cd common
-    - pipenv run jsonlint defs/*.json
-    - pipenv run jsonlint defs/*/*.json
-    - pipenv run python tools/cointool.py check
-    - pipenv run python tools/support.py check --ignore-missing
-    - pipenv run python protob/check.py
-    - pipenv run python protob/graph.py protob/*.proto  # TODO: artifacts?
-
-build core firmware:
-  stage: build
-  script:
-    - cd core
-    - pipenv run make build_cross
-    - pipenv run make build_boardloader
-    - pipenv run make build_bootloader
-    - pipenv run make build_prodtest
-    - pipenv run make build_firmware
-    # - test "$TREZOR_MODEL" = "1" || pipenv run make sizecheck
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
-    paths:
-    - core/build/firmware/firmware.bin
-    - core/build/bootloader/bootloader.bin
-    expire_in: 1 week
-
-build core unix:
-  stage: build
-  script:
-    - cd core
-    - pipenv run make build_unix_noui
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
-    untracked: true
-    expire_in: 1 day
-
-build legacy firmware:
-  stage: build
-  script:
-    - cd legacy
-    - pipenv run script/cibuild
-    - pipenv run make -C bootloader
-    - pipenv run make -C demo
-
-build legacy firmware debug:
-  stage: build
-  variables:
-    DEBUG_LINK: "1"
-  script:
-    - cd legacy
-    - pipenv run script/cibuild
-    - pipenv run make -C bootloader
-    - pipenv run make -C demo
-
-build legacy firmware bitcoinonly:
-  stage: build
-  variables:
-    BITCOIN_ONLY: "1"
-  script:
-    - cd legacy
-    - pipenv run script/cibuild
-    - pipenv run make -C bootloader
-    - pipenv run make -C demo
-
-build legacy emu:
-  stage: build
-  variables:
-    HEADLESS: "1"
-    EMULATOR: "1"
-    DEBUG_LINK: "1"
-  script:
-    - cd legacy
-    - pipenv run script/cibuild
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
-    untracked: true
-    expire_in: 1 day
-
-build crypto:
-  stage: build
-  script:
-    - cd crypto
-    - pipenv run make
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
-    untracked: true
-    expire_in: 1 day
-
-test core unix unit:
-  stage: test
-  dependencies:
-    - build core unix
-  script:
-    - cd core
-    - pipenv run make test
-
-test core unix device:
-  stage: test
-  dependencies:
-    - build core unix
-  script:
-    - cd core
-    - pipenv run make test_emu
-
-test core unix monero:
-  stage: test
-  dependencies:
-    - build core unix
-  script:
-    - cd core
-    - pipenv run make test_emu_monero
-
-# TODO: aren't some tests from .travis.yml missing?
-test legacy emu:
-  stage: test
-  dependencies:
-    - build legacy emu
-  variables:
-    EMULATOR: "1"
-  script:
-    - cd legacy
-    - pipenv run script/test
-
-test crypto:
-  stage: test
-  dependencies:
-    - build crypto
-  script:
-    - cd crypto
-    - ./tests/aestst
-    - ./tests/test_check
-    - CK_TIMEOUT_MULTIPLIER=20 valgrind -q --error-exitcode=1 ./tests/test_check
-    - ./tests/test_openssl 1000
-    - ITERS=10 pipenv run pytest tests/  # TODO are ITERS=10 propagated?
-
-test storage:
-  stage: test
-  dependencies: []
-  script:
-    - cd storage/tests
-    - pipenv run make build
-    - pipenv run make tests_all
+include:
+  - ci/environment.yml
+  - ci/prebuild.yml  # common, style
+  - ci/core.yml
+  - ci/legacy.yml
+  # - ci/python.yml  TODO
+  - ci/crypto.yml
+  - ci/storage.yml
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
--- a/ci/core.yml
+++ b/ci/core.yml
@ -0,0 +1,52 @@
+image: registry.corp.sldev.cz/trezor/trezor-firmware/environment
+
+build core firmware:
+  stage: build
+  script:
+    - cd core
+    - pipenv run make build_cross
+    - pipenv run make build_boardloader
+    - pipenv run make build_bootloader
+    - pipenv run make build_prodtest
+    - pipenv run make build_firmware
+    # - test "$TREZOR_MODEL" = "1" || pipenv run make sizecheck
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
+    paths:
+    - core/build/firmware/firmware.bin
+    - core/build/bootloader/bootloader.bin
+    expire_in: 1 week
+
+build core unix:
+  stage: build
+  script:
+    - cd core
+    - pipenv run make build_unix_noui
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
+    untracked: true
+    expire_in: 1 day
+
+test core unix unit:
+  stage: test
+  dependencies:
+    - build core unix
+  script:
+    - cd core
+    - pipenv run make test
+
+test core unix device:
+  stage: test
+  dependencies:
+    - build core unix
+  script:
+    - cd core
+    - pipenv run make test_emu
+
+test core unix monero:
+  stage: test
+  dependencies:
+    - build core unix
+  script:
+    - cd core
+    - pipenv run make test_emu_monero
--- a/ci/crypto.yml
+++ b/ci/crypto.yml
@ -0,0 +1,23 @@
+image: registry.corp.sldev.cz/trezor/trezor-firmware/environment
+
+build crypto:
+  stage: build
+  script:
+    - cd crypto
+    - pipenv run make
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
+    untracked: true
+    expire_in: 1 day
+
+test crypto:
+  stage: test
+  dependencies:
+    - build crypto
+  script:
+    - cd crypto
+    - ./tests/aestst
+    - ./tests/test_check
+    - CK_TIMEOUT_MULTIPLIER=20 valgrind -q --error-exitcode=1 ./tests/test_check
+    - ./tests/test_openssl 1000
+    - ITERS=10 pipenv run pytest tests/  # TODO are ITERS=10 propagated?
--- a/ci/environment.yml
+++ b/ci/environment.yml
@ -0,0 +1,15 @@
+environment:
+  stage: environment
+  image: docker:latest
+  variables:
+    CONTAINER_NAME: "$CI_REGISTRY/trezor/trezor-firmware/environment"
+  services:
+    - docker:dind
+  before_script:
+    - docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
+  when: manual
+  script:
+    - docker pull $CONTAINER_NAME:latest || true
+    - docker build --cache-from $CONTAINER_NAME:latest --tag $CONTAINER_NAME:$CI_COMMIT_SHA --tag $CONTAINER_NAME:latest ci/
+    - docker push $CONTAINER_NAME:$CI_COMMIT_SHA
+    - docker push $CONTAINER_NAME:latest
--- a/ci/legacy.yml
+++ b/ci/legacy.yml
@ -0,0 +1,54 @@
+image: registry.corp.sldev.cz/trezor/trezor-firmware/environment
+
+build legacy firmware:
+  stage: build
+  script:
+    - cd legacy
+    - pipenv run script/cibuild
+    - pipenv run make -C bootloader
+    - pipenv run make -C demo
+
+build legacy firmware debug:
+  stage: build
+  variables:
+    DEBUG_LINK: "1"
+  script:
+    - cd legacy
+    - pipenv run script/cibuild
+    - pipenv run make -C bootloader
+    - pipenv run make -C demo
+
+build legacy firmware bitcoinonly:
+  stage: build
+  variables:
+    BITCOIN_ONLY: "1"
+  script:
+    - cd legacy
+    - pipenv run script/cibuild
+    - pipenv run make -C bootloader
+    - pipenv run make -C demo
+
+build legacy emu:
+  stage: build
+  variables:
+    HEADLESS: "1"
+    EMULATOR: "1"
+    DEBUG_LINK: "1"
+  script:
+    - cd legacy
+    - pipenv run script/cibuild
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
+    untracked: true
+    expire_in: 1 day
+
+# TODO: aren't some tests from .travis.yml missing?
+test legacy emu:
+  stage: test
+  dependencies:
+    - build legacy emu
+  variables:
+    EMULATOR: "1"
+  script:
+    - cd legacy
+    - pipenv run script/test
--- a/ci/prebuild.yml
+++ b/ci/prebuild.yml
@ -0,0 +1,18 @@
+image: registry.corp.sldev.cz/trezor/trezor-firmware/environment
+
+prebuild style:
+  stage: prebuild
+  script:
+    - pipenv run make style_check
+    - cd core && pipenv run make templates_check  # TODO
+
+prebuild common:
+  stage: prebuild
+  script:
+    - cd common
+    - pipenv run jsonlint defs/*.json
+    - pipenv run jsonlint defs/*/*.json
+    - pipenv run python tools/cointool.py check
+    - pipenv run python tools/support.py check --ignore-missing
+    - pipenv run python protob/check.py
+    - pipenv run python protob/graph.py protob/*.proto  # TODO: artifacts?
--- a/ci/storage.yml
+++ b/ci/storage.yml
@ -0,0 +1,9 @@
+image: registry.corp.sldev.cz/trezor/trezor-firmware/environment
+
+test storage:
+  stage: test
+  dependencies: []
+  script:
+    - cd storage/tests
+    - pipenv run make build
+    - pipenv run make tests_all
--- a/core/build-docker.sh
+++ b/core/build-docker.sh
@ -21,7 +21,7 @@ else
 	REPOSITORY=https://github.com/$REPOSITORY/trezor-firmware.git
 fi

-docker build -t $IMAGE --build-arg TOOLCHAIN_FLAVOR=$TOOLCHAIN_FLAVOR core
+docker build -t $IMAGE --build-arg TOOLCHAIN_FLAVOR=$TOOLCHAIN_FLAVOR ci/

 USER=$(ls -lnd . | awk '{ print $3 }')
 GROUP=$(ls -lnd . | awk '{ print $4 }')
--- a/legacy/build.sh
+++ b/legacy/build.sh
@ -10,6 +10,6 @@ IMAGE=trezor-mcu-build
 USER=$(ls -lnd . | awk '{ print $3 }')
 GROUP=$(ls -lnd . | awk '{ print $4 }')

-docker build -t "$IMAGE" .
+docker build -t "$IMAGE" ci/
 docker run -it -v $(pwd):/src:z --user="$USER:$GROUP" "$IMAGE" \
    /src/legacy/script/fullbuild "$BOOTLOADER_COMMIT" "$FIRMWARE_COMMIT"