Commit d4c473e3 authored by Alén Arias Vázquez's avatar Alén Arias Vázquez 😎

modify CI

parent a292404f
Pipeline #4055 failed with stages
in 24 minutes and 7 seconds
......@@ -4,7 +4,7 @@ variables:
# Define stages
stages:
- gateware
- bootbin
- firmware
- release
# Built bistream job
......@@ -27,14 +27,14 @@ stages:
expire_in: 7d
# Build bitstream for each project
build_diot_v1:
diot-v1-GW:
extends: .build-gw
variables:
PROJECT: diot_v1
artifacts:
name: diot_v1-gw-$CI_JOB_ID
build_diot_v2:
diot-v2-GW:
extends: .build-gw
variables:
PROJECT: diot_v2
......@@ -42,8 +42,8 @@ build_diot_v2:
name: diot_v2-gw-$CI_JOB_ID
# Build OS
.build-image:
stage: bootbin
.build_sw:
stage: firmware
tags:
- petalinux-2019.2
script:
......@@ -53,16 +53,21 @@ build_diot_v2:
artifacts:
when: on_success
paths:
- sw/artifacts/BOOT.BIN
- sw/artifacts/image.ub
- sw/artifacts/fsbl.elf
- sw/artifacts/pmufw.elf
- sw/artifacts/pl_gateware.bit
- sw/artifacts/bl31.elf
- sw/artifacts/u-boot.elf
- sw/artifacts/system.dtb
- sw/artifacts/boot.bin
- sw/artifacts/image.ub
- sw/log/*
- gw/output_files/$PROJECT/diot_v$BOARD_VERSION.xsa
expire_in: 7d
# Build OS for each project
build-diot-v1-img:
extends: .build-image
diot-v1-SW:
extends: .build_sw
variables:
PROJECT: diot_v1
BOARD_VERSION: 1
......@@ -70,8 +75,8 @@ build-diot-v1-img:
name: diot_v1-linux-$CI_JOB_ID
# Build OS for each project
build-diot-v2-img:
extends: .build-image
diot-v2-SW:
extends: .build_sw
variables:
PROJECT: diot_v2
BOARD_VERSION: 2
......
......@@ -627,7 +627,7 @@ bootbin_build: bootbin_config $(BOOTGEN_BIN)
$(VT_LOOP) stat -c "%y %15s %n" artifacts/"$$i"; \
cp -a artifacts/"$$i" "$(BOOTBIN_DIR)" || exit 1; \
done $(LOGT)
$(V) cd "$(BOOTBIN_DIR)" && "$(BOOTGEN_BIN)" -image boot_bin.bif -arch zynqmp -w -o BOOT.BIN $(LOG)
$(V) cd "$(BOOTBIN_DIR)" && "$(BOOTGEN_BIN)" -image boot_bin.bif -arch zynqmp -w -o boot.bin $(LOG)
$(VT)echo -e "$(CO)Building boot.bin... done$(NC)" $(LOGT)
$(V) echo `date` > _done/$@ $(LOG)
......@@ -638,13 +638,13 @@ bootbin_build_force:
bootbin_artifacts: bootbin_build
$(VT)echo -e "$(CO)Copy boot.bin's artifacts...$(NC)" $(LOGT)
$(V) cp -v "$(BOOTBIN_DIR)"/BOOT.BIN artifacts $(LOG)
$(V) cp -v "$(BOOTBIN_DIR)"/boot.bin artifacts $(LOG)
$(VT)echo -e "$(CO)Copy boot.bin's artifacts... done$(NC)" $(LOGT)
$(V) echo `date` > _done/$@ $(LOG)
bootbin_clean:
$(VT)echo -e "$(CO)Clean boot.bin...$(NC)" $(LOGT)
$(V) rm -f "$(BOOTBIN_DIR)"/BOOT.BIN $(LOG)
$(V) rm -f "$(BOOTBIN_DIR)"/boot.bin $(LOG)
$(V) rm -f _done/bootbin_artifacts _done/bootbin_build _done/bootbin_config $(LOG)
$(VT)echo -e "$(CO)Clean boot.bin... done$(NC)" $(LOGT)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment