TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Jenkinsfiles to use new workspace environment variables and update labgrid.basesoftware submodule

Browse Source 
- Refactor Jenkinsfiles for am3xxx_pfc_generic, am6xxx, am6xxx_ems, imx6_vtpctp, and stm32mp1:
  - Replace LG_BAREBOX_*_LOCAL_WORKSPACE_PATH with LG_BOOTLOADER_*_LOCAL_WORKSPACE_PATH
  - Add LG_BOOTLOADER_WORKSPACE and LG_BOOTLOADER_BACKUP_WORKSPACE variables
  - Add LG_FIRMWARE_WORKSPACE and LG_KERNEL_WORKSPACE variables
  - Ensure consistent environment variable naming for firmware, bootloader, and kernel workspaces
- Update labgrid.basesoftware submodule

Signed-off-by: Oleg Karfich <oleg.karfich@wago.com>
This commit is contained in:
Oleg Karfich
2025-09-26 10:46:15 +02:00
parent a7a6504d5c
commit 81847d96d5
6 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jenkins/am3xxx_pfc_generic.jenkinsfile
+8 -2
View File
@@ -170,18 +170,24 @@ makefileProject {
"LG_FIRMWARE_PFCXXX_BUILDNUMBER=latest",
"LG_FIRMWARE_PFCG2_BUILDINFO_BUILDNAME=${artifactoryBuildPFC ?: this.getBuildname(runWrapperPFCG2).replace('/', ' :: ').replace('%2F', ' :: ')}",
"LG_FIRMWARE_PFCG2_BUILDNUMBER=${buildNumberPFC ?: this.getBuildnumber(runWrapperPFCG2)}",
"LG_FIRMWARE_LOCAL_WORKSPACE_PATH=",
"LG_FIRMWARE_WORKSPACE=artifactory",
"LG_BAREBOX_AM335X_BUILDINFO_BUILDNAME=${artifactoryBuildBareboxAm335x ?: this.getBuildname(runWrapperBareboxAM335x).replace('/', ' :: ').replace('%2F', ' :: ')}",
"LG_BAREBOX_AM335X_BUILDNUMBER=${buildNumberBareboxAm335x ?: this.getBuildnumber(runWrapperBareboxAM335x)}",
"LG_BOOTLOADER_LOCAL_WORKSPACE_PATH=",
"LG_BOOTLOADER_WORKSPACE=artifactory",
"LG_BAREBOX_BACKUP_AM335X_BUILDINFO_BUILDNAME=${artifactoryBuildBareboxAm335xBackup}",
"LG_BAREBOX_BACKUP_AM335X_BUILDNUMBER=${buildNumberBareboxAm335xBackup}",
"LG_BOOTLOADER_BACKUP_LOCAL_WORKSPACE_PATH=",
"LG_BOOTLOADER_BACKUP_WORKSPACE=artifactory",
"LG_BAREBOX_AM35XX_BUILDINFO_BUILDNAME=${artifactoryBuildBareboxAm35xx ?: this.getBuildname(runWrapperBareboxAM35xx).replace('/', ' :: ').replace('%2F', ' :: ')}",
"LG_BAREBOX_AM35XX_BUILDNUMBER=${buildNumberBareboxAm35xx ?: this.getBuildnumber(runWrapperBareboxAM35xx)}",
"LG_BAREBOX_BACKUP_AM35XX_BUILDINFO_BUILDNAME=${artifactoryBuildBareboxAm35xxBackup}",
"LG_BAREBOX_BACKUP_AM35XX_BUILDNUMBER=${buildNumberBareboxAm35xxBackup}",
"LG_BAREBOX_LOCAL_WORKSPACE_PATH=",
"LG_KERNEL_AM3XXX_BUILDINFO_BUILDNAME=${artifactoryBuildKernel ?: buildPathKernel.replace('/', ' :: ').replace('%2F', ' :: ')}",
"LG_KERNEL_AM3XXX_BUILDNUMBER=${buildNumberKernel}",
"LG_KERNEL_LOCAL_WORKSPACE_PATH=../../.build/deploy"
"LG_KERNEL_LOCAL_WORKSPACE_PATH=../../.build/deploy",
"LG_KERNEL_WORKSPACE=local"
])
}
}
jenkins/am6xxx.jenkinsfile
+8 -2
View File
@@ -149,14 +149,20 @@ makefileProject {
"LG_DEPLOY_BUDDY_STATE=deploy_firmware_to_flash",
"LG_FIRMWARE_PFC300_BUILDINFO_BUILDNAME=${artifactoryBuildPFC300 ?: this.getBuildname(runWrapperPFC300).replace('/', ' :: ').replace('%2F', ' :: ')}",
"LG_FIRMWARE_PFC300_BUILDNUMBER=${buildNumberPFC300 ?: this.getBuildnumber(runWrapperPFC300)}",
"LG_FIRMWARE_LOCAL_WORKSPACE_PATH=",
"LG_FIRMWARE_WORKSPACE=artifactory",
"LG_U_BOOT_AM6XXX_BUILDINFO_BUILDNAME=${artifactoryBuildUBoot ?: this.getBuildname(runWrapperUBoot).replace('/', ' :: ').replace('%2F', ' :: ')}",
"LG_U_BOOT_AM6XXX_BUILDNUMBER=${buildNumberUBoot ?: this.getBuildnumber(runWrapperUBoot)}",
"LG_BOOTLOADER_LOCAL_WORKSPACE_PATH=",
"LG_BOOTLOADER_WORKSPACE=artifactory",
"LG_U_BOOT_BACKUP_AM6XXX_BUILDINFO_BUILDNAME=${artifactoryBuildUBootFastboot}",
"LG_U_BOOT_BACKUP_AM6XXX_BUILDNUMBER=${buildNumberUBootFastboot}",
"LG_BAREBOX_LOCAL_WORKSPACE_PATH=",
"LG_BOOTLOADER_BACKUP_LOCAL_WORKSPACE_PATH=",
"LG_BOOTLOADER_BACKUP_WORKSPACE=artifactory",
"LG_KERNEL_AM6XXX_BUILDINFO_BUILDNAME=${artifactoryBuildKernel ?: buildPathKernel.replace('/', ' :: ').replace('%2F', ' :: ')}",
"LG_KERNEL_AM6XXX_BUILDNUMBER=${buildNumberKernel}",
"LG_KERNEL_LOCAL_WORKSPACE_PATH=../../.build/deploy"
"LG_KERNEL_LOCAL_WORKSPACE_PATH=../../.build/deploy",
"LG_KERNEL_WORKSPACE=local"
])
}
}
jenkins/am6xxx_ems.jenkinsfile
+8 -2
View File
@@ -149,14 +149,20 @@ makefileProject {
// "LG_DEPLOY_BUDDY_STATE=deploy_firmware_to_flash",
// "LG_FIRMWARE_PFC300_BUILDINFO_BUILDNAME=${artifactoryBuildPFC300 ?: this.getBuildname(runWrapperPFC300).replace('/', ' :: ').replace('%2F', ' :: ')}",
// "LG_FIRMWARE_PFC300_BUILDNUMBER=${buildNumberPFC300 ?: this.getBuildnumber(runWrapperPFC300)}",
// "LG_FIRMWARE_LOCAL_WORKSPACE_PATH=",
// "LG_FIRMWARE_WORKSPACE=artifactory",
// "LG_U_BOOT_AM6XXX_BUILDINFO_BUILDNAME=${artifactoryBuildUBoot ?: this.getBuildname(runWrapperUBoot).replace('/', ' :: ').replace('%2F', ' :: ')}",
// "LG_U_BOOT_AM6XXX_BUILDNUMBER=${buildNumberUBoot ?: this.getBuildnumber(runWrapperUBoot)}",
// "LG_BOOTLOADER_LOCAL_WORKSPACE_PATH=",
// "LG_BOOTLOADER_WORKSPACE=artifactory",
// "LG_U_BOOT_BACKUP_AM6XXX_BUILDINFO_BUILDNAME=${artifactoryBuildUBootFastboot}",
// "LG_U_BOOT_BACKUP_AM6XXX_BUILDNUMBER=${buildNumberUBootFastboot}",
// "LG_BAREBOX_LOCAL_WORKSPACE_PATH=",
// "LG_BOOTLOADER_BACKUP_LOCAL_WORKSPACE_PATH=",
// "LG_BOOTLOADER_BACKUP_WORKSPACE=artifactory",
// "LG_KERNEL_AM6XXX_BUILDINFO_BUILDNAME=${artifactoryBuildKernel ?: buildPathKernel.replace('/', ' :: ').replace('%2F', ' :: ')}",
// "LG_KERNEL_AM6XXX_BUILDNUMBER=${buildNumberKernel}",
// "LG_KERNEL_LOCAL_WORKSPACE_PATH=../.build/deploy"
// "LG_KERNEL_LOCAL_WORKSPACE_PATH=../.build/deploy",
// "LG_KERNEL_WORKSPACE=local"
// ])
// }
// }
jenkins/imx6_vtpctp.jenkinsfile
+9 -3
View File
@@ -154,16 +154,22 @@ makefileProject {
"LG_DEPLOY_BUDDY_STATE=deploy_firmware_to_flash",
"LG_FIRMWARE_VTPCTP_BUILDINFO_BUILDNAME=${artifactoryBuildPFC ?: this.getBuildname(runWrapperPFC).replace('/', ' :: ').replace('%2F', ' :: ')}",
"LG_FIRMWARE_VTPCTP_BUILDNUMBER=${buildNumberPFC ?: this.getBuildnumber(runWrapperPFC)}",
"LG_FIRMWARE_PFCG2_BUILDINFO_BUILDNAME=firmware :: pfc :: pfc-g2 :: main",
"LG_FIRMWARE_PFCG2_BUILDNUMBER=latest",
"LG_FIRMWARE_LOCAL_WORKSPACE_PATH=",
"LG_FIRMWARE_WORKSPACE=artifactory",
"LG_BAREBOX_IMX6_BUILDINFO_BUILDNAME=${artifactoryBuildBarebox ?: this.getBuildname(runWrapperBarebox).replace('/', ' :: ').replace('%2F', ' :: ')}",
"LG_BAREBOX_IMX6_BUILDNUMBER=${buildNumberBarebox ?: this.getBuildnumber(runWrapperBarebox)}",
"LG_BOOTLOADER_LOCAL_WORKSPACE_PATH=",
"LG_BOOTLOADER_WORKSPACE=artifactory",
"LG_BAREBOX_BACKUP_IMX6_BUILDINFO_BUILDNAME=${artifactoryBuildBareboxBackup}",
"LG_BAREBOX_BACKUP_IMX6_BUILDNUMBER=${buildNumberBareboxBackup}",
"LG_BAREBOX_LOCAL_WORKSPACE_PATH=",
"LG_BOOTLOADER_BACKUP_LOCAL_WORKSPACE_PATH=",
"LG_BOOTLOADER_BACKUP_WORKSPACE=artifactory",
"LG_KERNEL_IMX6_BUILDINFO_BUILDNAME=${artifactoryBuildKernel ?: buildPathKernel.replace('/', ' :: ').replace('%2F', ' :: ')}",
"LG_KERNEL_IMX6_BUILDNUMBER=${buildNumberKernel}",
"LG_KERNEL_LOCAL_WORKSPACE_PATH=../../.build/deploy",
"LG_FIRMWARE_PFCG2_BUILDINFO_BUILDNAME=firmware :: pfc :: pfc-g2 :: main",
"LG_FIRMWARE_PFCG2_BUILDNUMBER=latest",
"LG_KERNEL_WORKSPACE=local",
"LG_BAREBOX_AM335X_BUILDINFO_BUILDNAME=firmware :: pfc :: barebox :: am335x_pfc :: master",
"LG_BAREBOX_AM335X_BUILDNUMBER=latest",
"LG_BAREBOX_BACKUP_AM335X_BUILDINFO_BUILDNAME=firmware :: pfc :: barebox :: am335x_pfc :: release_w04.01.09_14",
jenkins/stm32mp1.jenkinsfile
+9 -3
View File
@@ -151,16 +151,22 @@ makefileProject {
"LG_DEPLOY_BUDDY_STATE=deploy_firmware_to_flash",
"LG_FIRMWARE_CC100_BUILDINFO_BUILDNAME=${artifactoryBuildPFC ?: this.getBuildname(runWrapperPFC).replace('/', ' :: ').replace('%2F', ' :: ')}",
"LG_FIRMWARE_CC100_BUILDNUMBER=${buildNumberPFC ?: this.getBuildnumber(runWrapperPFC)}",
"LG_FIRMWARE_PFCG2_BUILDINFO_BUILDNAME=firmware :: pfc :: pfc-g2 :: main",
"LG_FIRMWARE_PFCG2_BUILDNUMBER=latest",
"LG_FIRMWARE_LOCAL_WORKSPACE_PATH=",
"LG_FIRMWARE_WORKSPACE=artifactory",
"LG_BAREBOX_STM32MP1_BUILDINFO_BUILDNAME=${artifactoryBuildBarebox ?: this.getBuildname(runWrapperBarebox).replace('/', ' :: ').replace('%2F', ' :: ')}",
"LG_BAREBOX_STM32MP1_BUILDNUMBER=${buildNumberBarebox ?: this.getBuildnumber(runWrapperBarebox)}",
"LG_BOOTLOADER_LOCAL_WORKSPACE_PATH=",
"LG_BOOTLOADER_WORKSPACE=artifactory",
"LG_BAREBOX_BACKUP_STM32MP1_BUILDINFO_BUILDNAME=${artifactoryBuildBareboxBackup}",
"LG_BAREBOX_BACKUP_STM32MP1_BUILDNUMBER=${buildNumberBareboxBackup}",
"LG_BAREBOX_LOCAL_WORKSPACE_PATH=",
"LG_BOOTLOADER_BACKUP_LOCAL_WORKSPACE_PATH=",
"LG_BOOTLOADER_BACKUP_WORKSPACE=artifactory",
"LG_KERNEL_STM32MP1_BUILDINFO_BUILDNAME=${artifactoryBuildKernel ?: buildPathKernel.replace('/', ' :: ').replace('%2F', ' :: ')}",
"LG_KERNEL_STM32MP1_BUILDNUMBER=${buildNumberKernel}",
"LG_KERNEL_LOCAL_WORKSPACE_PATH=../../.build/deploy",
"LG_FIRMWARE_PFCG2_BUILDINFO_BUILDNAME=firmware :: pfc :: pfc-g2 :: main",
"LG_FIRMWARE_PFCG2_BUILDNUMBER=latest",
"LG_KERNEL_WORKSPACE=local",
"LG_BAREBOX_AM335X_BUILDINFO_BUILDNAME=firmware :: pfc :: barebox :: am335x_pfc :: master",
"LG_BAREBOX_AM335X_BUILDNUMBER=latest",
"LG_BAREBOX_BACKUP_AM335X_BUILDINFO_BUILDNAME=firmware :: pfc :: barebox :: am335x_pfc :: release_w04.01.09_14",
labgrid.basesoftware
+1 -1
Submodule labgrid.basesoftware updated: 284f501483...1fe52ea347