@@ -86,26 +86,17 @@ def process_target(px4board_file, target_name):
8686 assert platform , f"PLATFORM not found in { px4board_file } "
8787
8888 if platform not in excluded_platforms :
89- # get the container based on the platform and toolchain
90- # TODO enable once newer container is validated
91- # container = 'ghcr.io/px4/px4-dev:v1.16.0-alpha2-419-gd48631e2ce'
89+ container = 'ghcr.io/px4/px4-dev:v1.16.0-ondemand'
9290 if platform == 'posix' :
93- # TODO remove once newer container is validated
94- container = 'px4io/px4-dev-base-focal:2021-09-08'
9591 group = 'base'
9692 if toolchain :
9793 if toolchain .startswith ('aarch64' ):
98- # TODO remove once newer container is validated
99- container = 'px4io/px4-dev-aarch64:2022-08-12'
10094 group = 'aarch64'
10195 elif toolchain == 'arm-linux-gnueabihf' :
102- # TODO remove once newer container is validated
103- container = 'px4io/px4-dev-armhf:2023-06-26'
10496 group = 'armhf'
10597 else :
10698 if verbose : print (f'unmatched toolchain: { toolchain } ' )
10799 elif platform == 'nuttx' :
108- container = 'px4io/px4-dev:v1.16.0-ondemand'
109100 group = 'nuttx'
110101 else :
111102 if verbose : print (f'unmatched platform: { platform } ' )
@@ -129,10 +120,7 @@ def process_target(px4board_file, target_name):
129120# - Events
130121metadata_targets = ['airframe_metadata' , 'parameters_metadata' , 'extract_events' ]
131122grouped_targets ['base' ] = {}
132- # TODO remove once newer container is validated
133- grouped_targets ['base' ]['container' ] = 'px4io/px4-dev-base-focal:2021-09-08'
134- # TODO enable once newer container is validated
135- #grouped_targets['base']['container'] = 'ghcr.io/px4/px4-dev:v1.16.0-alpha2-419-gd48631e2ce'
123+ grouped_targets ['base' ]['container' ] = 'ghcr.io/px4/px4-dev:v1.16.0-ondemand'
136124grouped_targets ['base' ]['manufacturers' ] = {}
137125grouped_targets ['base' ]['manufacturers' ]['px4' ] = []
138126grouped_targets ['base' ]['manufacturers' ]['px4' ] += metadata_targets
0 commit comments