diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c0d6cb97a15dbad02393806ad24f7e19c246fd1f..f9c1c0b6680c88aa04ced32637ba788d7d9c31f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,19 +83,20 @@ synth-check-programming-files: ############################################################################### -# Hardware stage -# . for some reason we cannot use tags + trigger together. So this will be -# run on the shared Gitlab runner - which is fine. +# Trigger hardware test only on merge request ############################################################################### + trigger-opc-ua-test: stage: hardware + variables: + HDL_BRANCH: '$CI_COMMIT_BRANCH' only: changes: - applications/lofar2/images/lofar2_unb2b_sdp_station_full.tar.gz -# script: -# - echo "Found updated programming file. Triggering OPC UA test in SDPTR repo." +# - merge_requests + trigger: - project: DESP/UPEgear - branch: L2SDP-535 + project: LOFAR2.0/sdptr +# branch: L2SDP-571 #Point to specific branch when needed. Otherwise comment this out to trigger test in downstream master repo. diff --git a/applications/lofar2/images/lofar2_unb2b_sdp_station_full.tar.gz b/applications/lofar2/images/lofar2_unb2b_sdp_station_full.tar.gz index 34e6355a90e71d0161f12765a330aa0b6cd398a4..7dee884c8253b5084754d0bdfe736673225b1cc8 120000 --- a/applications/lofar2/images/lofar2_unb2b_sdp_station_full.tar.gz +++ b/applications/lofar2/images/lofar2_unb2b_sdp_station_full.tar.gz @@ -1 +1 @@ -lofar2_unb2b_sdp_station_full-r9ff51058a.tar.gz \ No newline at end of file +lofar2_unb2b_sdp_station_bf-r087d98be6.tar.gz \ No newline at end of file