diff --git a/.gitlab/cdrouter/glinet-b1300.yml b/.gitlab/cdrouter/glinet-b1300.yml index 82c5f6cd64..b2cd577809 100644 --- a/.gitlab/cdrouter/glinet-b1300.yml +++ b/.gitlab/cdrouter/glinet-b1300.yml @@ -70,8 +70,8 @@ CDRouter-TR-069 Gl.iNet NOR: <<: *glinet_cdrouter variables: LABGRID_TARGET: glinet-b1300-nor - TFTP_IMAGE_FILENAME: openwrt-ipq40xx-generic-glinet_gl-b1300-squashfs-sysupgrade.bin - TFTP_IMAGE_FILENAME_PATTERN: /.*openwrt-ipq40xx-generic-glinet_gl-b1300-squashfs-sysupgrade.bin/ + TFTP_IMAGE_FILENAME: prplos-ipq40xx-generic-glinet_gl-b1300-squashfs-sysupgrade.bin + TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-ipq40xx-generic-glinet_gl-b1300-squashfs-sysupgrade.bin/ DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh diff --git a/.gitlab/cdrouter/prpl-haze.yml b/.gitlab/cdrouter/prpl-haze.yml index 932736c676..b62795b63a 100644 --- a/.gitlab/cdrouter/prpl-haze.yml +++ b/.gitlab/cdrouter/prpl-haze.yml @@ -77,8 +77,8 @@ CDRouter-TR-069 Haze eMMC: <<: *prpl_haze variables: LABGRID_TARGET: prpl-haze-emmc - TFTP_IMAGE_FILENAME: openwrt-ipq807x-generic-prpl_haze-squashfs-sysupgrade.bin - TFTP_IMAGE_FILENAME_PATTERN: /.*openwrt-ipq807x-generic-prpl_haze-squashfs-sysupgrade.bin/ + TFTP_IMAGE_FILENAME: prplos-ipq807x-generic-prpl_haze-squashfs-sysupgrade.bin + TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-ipq807x-generic-prpl_haze-squashfs-sysupgrade.bin/ DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh diff --git a/.gitlab/cdrouter/turris-omnia.yml b/.gitlab/cdrouter/turris-omnia.yml index 6630ac4b01..8e1c7dcede 100644 --- a/.gitlab/cdrouter/turris-omnia.yml +++ b/.gitlab/cdrouter/turris-omnia.yml @@ -84,8 +84,8 @@ CDRouter-TR-069 Turris eMMC: <<: *turris_cdrouter variables: LABGRID_TARGET: turris-omnia-emmc - TFTP_IMAGE_FILENAME: openwrt-mvebu-cortexa9-cznic_turris-omnia-sysupgrade.img.gz - TFTP_IMAGE_FILENAME_PATTERN: /.*openwrt-mvebu-cortexa9-cznic_turris-omnia-sysupgrade.img.gz/ + TFTP_IMAGE_FILENAME: prplos-mvebu-cortexa9-cznic_turris-omnia-sysupgrade.img.gz + TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-mvebu-cortexa9-cznic_turris-omnia-sysupgrade.img.gz/ TFTP_IMAGE_UNPACK_COMMAND: "gunzip --force $TESTBED_TFTP_PATH/$TFTP_IMAGE_FILENAME || true" DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh diff --git a/.gitlab/cdrouter/wnc-freedom.yml b/.gitlab/cdrouter/wnc-freedom.yml index be0239e1e8..f7174548b0 100644 --- a/.gitlab/cdrouter/wnc-freedom.yml +++ b/.gitlab/cdrouter/wnc-freedom.yml @@ -77,8 +77,8 @@ CDRouter-TR-069 Freedom eMMC: <<: *wnc_freedom variables: LABGRID_TARGET: wnc-freedom-emmc - TFTP_IMAGE_FILENAME: openwrt-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin - TFTP_IMAGE_FILENAME_PATTERN: /.*openwrt-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin/ + TFTP_IMAGE_FILENAME: prplos-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin + TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin/ DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh diff --git a/.gitlab/docker/ib/gitlab.yml b/.gitlab/docker/ib/gitlab.yml index a223b80112..47fa313bb9 100644 --- a/.gitlab/docker/ib/gitlab.yml +++ b/.gitlab/docker/ib/gitlab.yml @@ -6,7 +6,7 @@ build Docker image ib-mvebu-cortexa9: DOCKER_BUILD_EXTRA_ARGS: --build-arg DESIGNATED_BRANCH=$CI_DESIGNATED_BRANCH extends: .build Docker image before_script: - - tar xf bin/targets/mvebu/cortexa9/openwrt-imagebuilder-mvebu-cortexa9.Linux-x86_64.tar.xz --strip=1 -C .gitlab/docker/ib + - tar xf bin/targets/mvebu/cortexa9/prplos-imagebuilder-mvebu-cortexa9.Linux-x86_64.tar.xz --strip=1 -C .gitlab/docker/ib test Docker image ib-mvebu-cortexa9: extends: .test Docker IB image @@ -29,7 +29,7 @@ build Docker image ib-x86-64: DOCKER_BUILD_EXTRA_ARGS: --build-arg DESIGNATED_BRANCH=$CI_DESIGNATED_BRANCH extends: .build Docker image before_script: - - tar xf bin/targets/x86/64/openwrt-imagebuilder-x86-64.Linux-x86_64.tar.xz --strip=1 -C .gitlab/docker/ib + - tar xf bin/targets/x86/64/prplos-imagebuilder-x86-64.Linux-x86_64.tar.xz --strip=1 -C .gitlab/docker/ib test Docker image ib-x86-64: stage: docker SDK and IB test @@ -52,7 +52,7 @@ build Docker image ib-ipq807x-generic: DOCKER_BUILD_EXTRA_ARGS: --build-arg DESIGNATED_BRANCH=$CI_DESIGNATED_BRANCH extends: .build Docker image before_script: - - tar xf bin/targets/ipq807x/generic/openwrt-imagebuilder-ipq807x-generic.Linux-x86_64.tar.xz --strip=1 -C .gitlab/docker/ib + - tar xf bin/targets/ipq807x/generic/prplos-imagebuilder-ipq807x-generic.Linux-x86_64.tar.xz --strip=1 -C .gitlab/docker/ib test Docker image ib-ipq807x-generic: extends: .test Docker IB image diff --git a/.gitlab/docker/sdk/gitlab.yml b/.gitlab/docker/sdk/gitlab.yml index d9ff0ca0fc..bf769fedc3 100644 --- a/.gitlab/docker/sdk/gitlab.yml +++ b/.gitlab/docker/sdk/gitlab.yml @@ -6,7 +6,7 @@ build Docker image sdk-mvebu-cortexa9: DOCKER_BUILD_EXTRA_ARGS: --build-arg DESIGNATED_BRANCH=$CI_DESIGNATED_BRANCH extends: .build Docker image before_script: - - tar xf bin/targets/mvebu/cortexa9/openwrt-sdk-mvebu-cortexa9_gcc*Linux-x86_64.tar.xz --strip=1 -C .gitlab/docker/sdk + - tar xf bin/targets/mvebu/cortexa9/prplos-sdk-mvebu-cortexa9_gcc*Linux-x86_64.tar.xz --strip=1 -C .gitlab/docker/sdk test Docker image sdk-mvebu-cortexa9: extends: .test Docker SDK image @@ -26,7 +26,7 @@ build Docker image sdk-x86-64: DOCKER_BUILD_EXTRA_ARGS: --build-arg DESIGNATED_BRANCH=$CI_DESIGNATED_BRANCH extends: .build Docker image before_script: - - tar xf bin/targets/x86/64/openwrt-sdk-x86-64_gcc*.Linux-x86_64.tar.xz --strip=1 -C .gitlab/docker/sdk + - tar xf bin/targets/x86/64/prplos-sdk-x86-64_gcc*.Linux-x86_64.tar.xz --strip=1 -C .gitlab/docker/sdk test Docker image sdk-x86-64: extends: .test Docker SDK image @@ -46,7 +46,7 @@ build Docker image sdk-ipq807x-generic: DOCKER_BUILD_EXTRA_ARGS: --build-arg DESIGNATED_BRANCH=$CI_DESIGNATED_BRANCH extends: .build Docker image before_script: - - tar xf bin/targets/ipq807x/generic/openwrt-sdk-ipq807x-generic_gcc*.Linux-x86_64.tar.xz --strip=1 -C .gitlab/docker/sdk + - tar xf bin/targets/ipq807x/generic/prplos-sdk-ipq807x-generic_gcc*.Linux-x86_64.tar.xz --strip=1 -C .gitlab/docker/sdk test Docker image sdk-ipq807x-generic: extends: .test Docker SDK image @@ -66,7 +66,7 @@ build Docker image sdk-qca_ipq95xx-generic: DOCKER_BUILD_EXTRA_ARGS: --build-arg DESIGNATED_BRANCH=$CI_DESIGNATED_BRANCH extends: .build Docker image before_script: - - tar xf bin/targets/ipq95xx/generic/openwrt-sdk-ipq95xx-generic_gcc*.Linux-x86_64.tar.xz --strip=1 -C .gitlab/docker/sdk + - tar xf bin/targets/ipq95xx/generic/prplos-sdk-ipq95xx-generic_gcc*.Linux-x86_64.tar.xz --strip=1 -C .gitlab/docker/sdk test Docker image sdk-qca_ipq95xx-generic: extends: .test Docker SDK image diff --git a/.gitlab/release.yml b/.gitlab/release.yml index d63705a7a3..c4d450589d 100644 --- a/.gitlab/release.yml +++ b/.gitlab/release.yml @@ -20,46 +20,46 @@ upload: # mvebu - | curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \ - --upload-file bin/targets/mvebu/cortexa9/openwrt-mvebu-cortexa9-cznic_turris-omnia-initramfs-kernel.bin \ - ${PACKAGE_REGISTRY_URL}/turris-omnia/${prplos_version}/openwrt-mvebu-cortexa9-cznic_turris-omnia-initramfs-kernel.bin + --upload-file bin/targets/mvebu/cortexa9/prplos-mvebu-cortexa9-cznic_turris-omnia-initramfs-kernel.bin \ + ${PACKAGE_REGISTRY_URL}/turris-omnia/${prplos_version}/prplos-mvebu-cortexa9-cznic_turris-omnia-initramfs-kernel.bin - | curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \ - --upload-file bin/targets/mvebu/cortexa9/openwrt-mvebu-cortexa9-cznic_turris-omnia-sysupgrade.img.gz \ - ${PACKAGE_REGISTRY_URL}/turris-omnia/${prplos_version}/openwrt-mvebu-cortexa9-cznic_turris-omnia-sysupgrade.img.gz + --upload-file bin/targets/mvebu/cortexa9/prplos-mvebu-cortexa9-cznic_turris-omnia-sysupgrade.img.gz \ + ${PACKAGE_REGISTRY_URL}/turris-omnia/${prplos_version}/prplos-mvebu-cortexa9-cznic_turris-omnia-sysupgrade.img.gz # x86 - | curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \ - --upload-file bin/targets/x86/64/openwrt-x86-64-generic-initramfs-kernel.bin \ - ${PACKAGE_REGISTRY_URL}/x86-64/${prplos_version}/openwrt-x86-64-generic-initramfs-kernel.bin + --upload-file bin/targets/x86/64/prplos-x86-64-generic-initramfs-kernel.bin \ + ${PACKAGE_REGISTRY_URL}/x86-64/${prplos_version}/prplos-x86-64-generic-initramfs-kernel.bin - | curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \ - --upload-file bin/targets/x86/64/openwrt-x86-64-generic-squashfs-combined-efi.img \ - ${PACKAGE_REGISTRY_URL}/x86-64/${prplos_version}/openwrt-x86-64-generic-squashfs-combined-efi.img + --upload-file bin/targets/x86/64/prplos-x86-64-generic-squashfs-combined-efi.img \ + ${PACKAGE_REGISTRY_URL}/x86-64/${prplos_version}/prplos-x86-64-generic-squashfs-combined-efi.img # ipq807x - | curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \ - --upload-file bin/targets/ipq807x/generic/openwrt-ipq807x-generic-prpl_haze-initramfs-uImage.itb \ - ${PACKAGE_REGISTRY_URL}/prpl-haze/${prplos_version}/openwrt-ipq807x-generic-prpl_haze-initramfs-uImage.itb + --upload-file bin/targets/ipq807x/generic/prplos-ipq807x-generic-prpl_haze-initramfs-uImage.itb \ + ${PACKAGE_REGISTRY_URL}/prpl-haze/${prplos_version}/prplos-ipq807x-generic-prpl_haze-initramfs-uImage.itb - | curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \ - --upload-file bin/targets/ipq807x/generic/openwrt-ipq807x-generic-prpl_haze-squashfs-sysupgrade.bin \ - ${PACKAGE_REGISTRY_URL}/prpl-haze/${prplos_version}/openwrt-ipq807x-generic-prpl_haze-squashfs-sysupgrade.bin + --upload-file bin/targets/ipq807x/generic/prplos-ipq807x-generic-prpl_haze-squashfs-sysupgrade.bin \ + ${PACKAGE_REGISTRY_URL}/prpl-haze/${prplos_version}/prplos-ipq807x-generic-prpl_haze-squashfs-sysupgrade.bin # qca_ipq95xx - | curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \ - --upload-file bin/targets/ipq95xx/generic/openwrt-ipq95xx-prpl_freedom-initramfs-uImage.itb \ - ${PACKAGE_REGISTRY_URL}/wnc-freedom/${prplos_version}/openwrt-ipq95xx-prpl_freedom-initramfs-uImage.itb + --upload-file bin/targets/ipq95xx/generic/prplos-ipq95xx-prpl_freedom-initramfs-uImage.itb \ + ${PACKAGE_REGISTRY_URL}/wnc-freedom/${prplos_version}/prplos-ipq95xx-prpl_freedom-initramfs-uImage.itb - | curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \ - --upload-file bin/targets/ipq95xx/generic/openwrt-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin \ - ${PACKAGE_REGISTRY_URL}/wnc-freedom/${prplos_version}/openwrt-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin + --upload-file bin/targets/ipq95xx/generic/prplos-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin \ + ${PACKAGE_REGISTRY_URL}/wnc-freedom/${prplos_version}/prplos-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin release: stage: release @@ -76,13 +76,13 @@ release: - | release-cli create --name "prplOS release $prplos_version" --tag-name $CI_COMMIT_TAG \ - --assets-link "{\"name\":\"MaxLinear OSP HDK-3 fullimage\",\"url\":\"https://storage.cloud.google.com/prplos-osp-releases/${CI_COMMIT_TAG}/targets/intel_x86/lgm/openwrt-intel_x86-lgm-PRPL_OSP_TB341-osp_tb341_fullimage.img\"}" \ - --assets-link "{\"name\":\"MaxLinear LGP B0 PON fullimage\",\"url\":\"https://storage.cloud.google.com/prplos-osp-releases/${CI_COMMIT_TAG}/targets/intel_x86/lgm/openwrt-intel_x86-lgm-LGM_PRPL-lgp_b0_pon_fullimage.img\"}" \ - --assets-link "{\"name\":\"prpl Haze sysupgrade\",\"url\":\"${PACKAGE_REGISTRY_URL}/prpl-haze/${prplos_version}/openwrt-ipq807x-generic-prpl_haze-squashfs-sysupgrade.bin\"}" \ - --assets-link "{\"name\":\"prpl Haze initramfs\",\"url\":\"${PACKAGE_REGISTRY_URL}/prpl-haze/${prplos_version}/openwrt-ipq807x-generic-prpl_haze-initramfs-uImage.itb\"}" \ - --assets-link "{\"name\":\"Turris Omnia sysupgrade\",\"url\":\"${PACKAGE_REGISTRY_URL}/turris-omnia/${prplos_version}/openwrt-mvebu-cortexa9-cznic_turris-omnia-initramfs-kernel.bin\"}" \ - --assets-link "{\"name\":\"Turris Omnia initramfs\",\"url\":\"${PACKAGE_REGISTRY_URL}/turris-omnia/${prplos_version}/openwrt-mvebu-cortexa9-cznic_turris-omnia-sysupgrade.img.gz\"}" \ - --assets-link "{\"name\":\"WNC Freedom sysupgrade\",\"url\":\"${PACKAGE_REGISTRY_URL}/wnc-freedom/${prplos_version}/openwrt-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin\"}" \ - --assets-link "{\"name\":\"WNC Freedom initramfs\",\"url\":\"${PACKAGE_REGISTRY_URL}/wnc-freedom/${prplos_version}/openwrt-ipq95xx-prpl_freedom-initramfs-uImage.itb\"}" \ - --assets-link "{\"name\":\"x86/64 sysupgrade\",\"url\":\"${PACKAGE_REGISTRY_URL}/x86-64/${prplos_version}/openwrt-x86-64-generic-squashfs-combined-efi.img\"}" \ - --assets-link "{\"name\":\"x86/64 initramfs\",\"url\":\"${PACKAGE_REGISTRY_URL}/x86-64/${prplos_version}/openwrt-x86-64-generic-initramfs-kernel.bin\"}" + --assets-link "{\"name\":\"MaxLinear OSP HDK-3 fullimage\",\"url\":\"https://storage.cloud.google.com/prplos-osp-releases/${CI_COMMIT_TAG}/targets/intel_x86/lgm/prplos-intel_x86-lgm-PRPL_OSP_TB341-osp_tb341_fullimage.img\"}" \ + --assets-link "{\"name\":\"MaxLinear LGP B0 PON fullimage\",\"url\":\"https://storage.cloud.google.com/prplos-osp-releases/${CI_COMMIT_TAG}/targets/intel_x86/lgm/prplos-intel_x86-lgm-LGM_PRPL-lgp_b0_pon_fullimage.img\"}" \ + --assets-link "{\"name\":\"prpl Haze sysupgrade\",\"url\":\"${PACKAGE_REGISTRY_URL}/prpl-haze/${prplos_version}/prplos-ipq807x-generic-prpl_haze-squashfs-sysupgrade.bin\"}" \ + --assets-link "{\"name\":\"prpl Haze initramfs\",\"url\":\"${PACKAGE_REGISTRY_URL}/prpl-haze/${prplos_version}/prplos-ipq807x-generic-prpl_haze-initramfs-uImage.itb\"}" \ + --assets-link "{\"name\":\"Turris Omnia sysupgrade\",\"url\":\"${PACKAGE_REGISTRY_URL}/turris-omnia/${prplos_version}/prplos-mvebu-cortexa9-cznic_turris-omnia-initramfs-kernel.bin\"}" \ + --assets-link "{\"name\":\"Turris Omnia initramfs\",\"url\":\"${PACKAGE_REGISTRY_URL}/turris-omnia/${prplos_version}/prplos-mvebu-cortexa9-cznic_turris-omnia-sysupgrade.img.gz\"}" \ + --assets-link "{\"name\":\"WNC Freedom sysupgrade\",\"url\":\"${PACKAGE_REGISTRY_URL}/wnc-freedom/${prplos_version}/prplos-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin\"}" \ + --assets-link "{\"name\":\"WNC Freedom initramfs\",\"url\":\"${PACKAGE_REGISTRY_URL}/wnc-freedom/${prplos_version}/prplos-ipq95xx-prpl_freedom-initramfs-uImage.itb\"}" \ + --assets-link "{\"name\":\"x86/64 sysupgrade\",\"url\":\"${PACKAGE_REGISTRY_URL}/x86-64/${prplos_version}/prplos-x86-64-generic-squashfs-combined-efi.img\"}" \ + --assets-link "{\"name\":\"x86/64 initramfs\",\"url\":\"${PACKAGE_REGISTRY_URL}/x86-64/${prplos_version}/prplos-x86-64-generic-initramfs-kernel.bin\"}" diff --git a/.gitlab/testbed/glinet-b1300.yml b/.gitlab/testbed/glinet-b1300.yml index ec181fa0ce..aee80af8d7 100644 --- a/.gitlab/testbed/glinet-b1300.yml +++ b/.gitlab/testbed/glinet-b1300.yml @@ -8,7 +8,7 @@ DUT_CPU_TYPE: cortex-a7 DUT_CPU_SUBTYPE: neon-vfpv4 LABGRID_TARGET: glinet-b1300-initramfs - TFTP_IMAGE_FILENAME: openwrt-ipq40xx-generic-glinet_gl-b1300-initramfs-fit-zImage.itb - TFTP_IMAGE_FILENAME_PATTERN: /.*openwrt-ipq40xx-generic-glinet_gl-b1300-initramfs-fit-zImage.itb/ + TFTP_IMAGE_FILENAME: prplos-ipq40xx-generic-glinet_gl-b1300-initramfs-fit-zImage.itb + TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-ipq40xx-generic-glinet_gl-b1300-initramfs-fit-zImage.itb/ tags: - dut-glinet-b1300 diff --git a/.gitlab/testbed/mxl25641-hdk-6.yml b/.gitlab/testbed/mxl25641-hdk-6.yml index a108a0cddd..8bb33875de 100644 --- a/.gitlab/testbed/mxl25641-hdk-6.yml +++ b/.gitlab/testbed/mxl25641-hdk-6.yml @@ -6,8 +6,8 @@ DUT_SUBTARGET: lgm DUT_BOARD: mxl25641-hdk-6 LABGRID_TARGET: mxl25641-hdk-6-emmc - TFTP_IMAGE_FILENAME: openwrt-intel_x86-lgm-PRPL_OSP_TB341_v2-osp_tb341_v2_wav700_eth_fullimage.img - TFTP_IMAGE_FILENAME_PATTERN: /.*openwrt-intel_x86-lgm-PRPL_OSP_TB341_v2-osp_tb341_v2_wav700_eth_fullimage.img/ + TFTP_IMAGE_FILENAME: prplos-intel_x86-lgm-PRPL_OSP_TB341_v2-osp_tb341_v2_wav700_eth_fullimage.img + TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-intel_x86-lgm-PRPL_OSP_TB341_v2-osp_tb341_v2_wav700_eth_fullimage.img/ DUT_ARCH_PACKAGES_PATH: $PACKAGE_DIR/${DUT_ARCH} tags: - dut-mxl25641-hdk-6 diff --git a/.gitlab/testbed/prpl-haze.yml b/.gitlab/testbed/prpl-haze.yml index ca5f7d9207..02409d51d8 100644 --- a/.gitlab/testbed/prpl-haze.yml +++ b/.gitlab/testbed/prpl-haze.yml @@ -8,8 +8,8 @@ DUT_CPU_TYPE: cortex-a53 DUT_WAN_INTERFACE: wan LABGRID_TARGET: prpl-haze-initramfs - TFTP_IMAGE_FILENAME: openwrt-ipq807x-generic-prpl_haze-initramfs-uImage.itb - TFTP_IMAGE_FILENAME_PATTERN: /.*openwrt-ipq807x-generic-prpl_haze-initramfs-uImage.itb/ + TFTP_IMAGE_FILENAME: prplos-ipq807x-generic-prpl_haze-initramfs-uImage.itb + TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-ipq807x-generic-prpl_haze-initramfs-uImage.itb/ DUT_ARCH_PACKAGES_PATH: $PACKAGE_DIR/${DUT_ARCH}_${DUT_CPU_TYPE} tags: - dut-prpl-haze diff --git a/.gitlab/testbed/turris-omnia.yml b/.gitlab/testbed/turris-omnia.yml index f78c73a3cd..82f60a3eed 100644 --- a/.gitlab/testbed/turris-omnia.yml +++ b/.gitlab/testbed/turris-omnia.yml @@ -9,7 +9,7 @@ DUT_CPU_SUBTYPE: vfpv3-d16 DUT_WAN_INTERFACE: eth2 LABGRID_TARGET: turris-omnia-initramfs - TFTP_IMAGE_FILENAME: openwrt-mvebu-cortexa9-cznic_turris-omnia-initramfs-kernel.bin - TFTP_IMAGE_FILENAME_PATTERN: /.*openwrt-mvebu-cortexa9-cznic_turris-omnia-initramfs-kernel.bin/ + TFTP_IMAGE_FILENAME: prplos-mvebu-cortexa9-cznic_turris-omnia-initramfs-kernel.bin + TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-mvebu-cortexa9-cznic_turris-omnia-initramfs-kernel.bin/ tags: - dut-turris-omnia diff --git a/.gitlab/testbed/urx851-b0-dk-pon.yml b/.gitlab/testbed/urx851-b0-dk-pon.yml index b826cd5a5a..a0ce4db288 100644 --- a/.gitlab/testbed/urx851-b0-dk-pon.yml +++ b/.gitlab/testbed/urx851-b0-dk-pon.yml @@ -7,8 +7,8 @@ DUT_BOARD: urx851-b0-dk-pon LABGRID_TARGET: urx851-b0-dk-pon-emmc DUT_WAN_INTERFACE: VANI0 - TFTP_IMAGE_FILENAME: openwrt-intel_x86-lgm-LGM_PRPL-lgp_b0_pon_fullimage.img - TFTP_IMAGE_FILENAME_PATTERN: /.*openwrt-intel_x86-lgm-LGM_PRPL-lgp_b0_pon_fullimage.img/ + TFTP_IMAGE_FILENAME: prplos-intel_x86-lgm-LGM_PRPL-lgp_b0_pon_fullimage.img + TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-intel_x86-lgm-LGM_PRPL-lgp_b0_pon_fullimage.img/ DUT_ARCH_PACKAGES_PATH: $PACKAGE_DIR/${DUT_ARCH} tags: - dut-urx851-b0-dk-pon diff --git a/.gitlab/testbed/urx851-b0-dk.yml b/.gitlab/testbed/urx851-b0-dk.yml index 3218549d0e..a849f71f8b 100644 --- a/.gitlab/testbed/urx851-b0-dk.yml +++ b/.gitlab/testbed/urx851-b0-dk.yml @@ -6,8 +6,8 @@ DUT_SUBTARGET: lgm DUT_BOARD: urx851-b0-dk LABGRID_TARGET: urx851-b0-dk-emmc - TFTP_IMAGE_FILENAME: openwrt-intel_x86-lgm-LGM_PRPL-lgp_b0_fullimage.img - TFTP_IMAGE_FILENAME_PATTERN: /.*openwrt-intel_x86-lgm-LGM_PRPL-lgp_b0_fullimage.img/ + TFTP_IMAGE_FILENAME: prplos-intel_x86-lgm-LGM_PRPL-lgp_b0_fullimage.img + TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-intel_x86-lgm-LGM_PRPL-lgp_b0_fullimage.img/ DUT_ARCH_PACKAGES_PATH: $PACKAGE_DIR/${DUT_ARCH} tags: - dut-urx851-b0-dk diff --git a/.gitlab/testbed/urx851-hdk-3.yml b/.gitlab/testbed/urx851-hdk-3.yml index d989aceca9..6ff26d7c38 100644 --- a/.gitlab/testbed/urx851-hdk-3.yml +++ b/.gitlab/testbed/urx851-hdk-3.yml @@ -6,8 +6,8 @@ DUT_SUBTARGET: lgm DUT_BOARD: urx851-hdk-3 LABGRID_TARGET: urx851-hdk-3-emmc - TFTP_IMAGE_FILENAME: openwrt-intel_x86-lgm-PRPL_OSP_TB341-osp_tb341_fullimage.img - TFTP_IMAGE_FILENAME_PATTERN: /.*openwrt-intel_x86-lgm-PRPL_OSP_TB341-osp_tb341_fullimage.img/ + TFTP_IMAGE_FILENAME: prplos-intel_x86-lgm-PRPL_OSP_TB341-osp_tb341_fullimage.img + TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-intel_x86-lgm-PRPL_OSP_TB341-osp_tb341_fullimage.img/ DUT_ARCH_PACKAGES_PATH: $PACKAGE_DIR/${DUT_ARCH} tags: - dut-urx851-hdk-3 diff --git a/.gitlab/testbed/wnc-freedom.yml b/.gitlab/testbed/wnc-freedom.yml index 19ccbe90ee..672f368c83 100644 --- a/.gitlab/testbed/wnc-freedom.yml +++ b/.gitlab/testbed/wnc-freedom.yml @@ -9,7 +9,7 @@ DUT_CPU_SUBTYPE: neon-vfpv4 DUT_WAN_INTERFACE: wan LABGRID_TARGET: wnc-freedom-initramfs - TFTP_IMAGE_FILENAME: openwrt-ipq95xx-prpl_freedom-initramfs-uImage.itb - TFTP_IMAGE_FILENAME_PATTERN: /.*openwrt-ipq95xx-prpl_freedom-initramfs-uImage.itb/ + TFTP_IMAGE_FILENAME: prplos-ipq95xx-prpl_freedom-initramfs-uImage.itb + TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-ipq95xx-prpl_freedom-initramfs-uImage.itb/ tags: - dut-wnc-freedom diff --git a/.testbed/labgrid/default.yaml b/.testbed/labgrid/default.yaml index 583c216b0c..8a3f266eb2 100644 --- a/.testbed/labgrid/default.yaml +++ b/.testbed/labgrid/default.yaml @@ -147,7 +147,7 @@ targets: - setenv ipaddr 192.168.1.1 - setenv bootargs debug earlyprintk console=ttyS0,115200 - ping 192.168.1.2; ping 192.168.1.2; ping 192.168.1.2 - - tftpboot 0x81000000 openwrt-ath79-generic-tplink_archer-c6-v2-initramfs-kernel.bin + - tftpboot 0x81000000 prplos-ath79-generic-tplink_archer-c6-v2-initramfs-kernel.bin UBootStrategy: {} glinet-b1300-initramfs: @@ -175,7 +175,7 @@ targets: - setenv ipaddr 192.168.1.1 boot_command_delay: 5 boot_timeout: 90 - boot_command: tftpboot 0x88000000 openwrt-ipq40xx-generic-glinet_gl-b1300-initramfs-fit-zImage.itb && bootm 0x88000000 + boot_command: tftpboot 0x88000000 prplos-ipq40xx-generic-glinet_gl-b1300-initramfs-fit-zImage.itb && bootm 0x88000000 UBootStrategy: {} glinet-b1300-nor: @@ -203,7 +203,7 @@ targets: - setenv ipaddr 192.168.1.1 boot_command_delay: 5 boot_timeout: 180 - boot_command: tftpboot 0x84000000 openwrt-ipq40xx-generic-glinet_gl-b1300-squashfs-sysupgrade.bin && sf probe && sf erase 0x180000 0x1e80000 && sf write 0x84000000 0x180000 $filesize && bootipq + boot_command: tftpboot 0x84000000 prplos-ipq40xx-generic-glinet_gl-b1300-squashfs-sysupgrade.bin && sf probe && sf erase 0x180000 0x1e80000 && sf write 0x84000000 0x180000 $filesize && bootipq UBootStrategy: {} # needs patched u-boot for emmc r/w https://lists.denx.de/pipermail/u-boot/2021-February/441964.html @@ -228,7 +228,7 @@ targets: init_commands: - setenv bootargs earlyprintk console=ttyS0,115200 - setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x7ffff && setexpr blkcnt ${blkcnt} / 0x80000 && setexpr blkcnt ${blkcnt} * 0x400' - - dhcp ${kernel_addr_r} openwrt-mvebu-cortexa9-cznic_turris-omnia-sysupgrade.img + - dhcp ${kernel_addr_r} prplos-mvebu-cortexa9-cznic_turris-omnia-sysupgrade.img boot_command: run set_blkcnt && mmc dev 0 0 && mmc erase 0 ${blkcnt} && mmc write ${kernel_addr_r} 0 ${blkcnt} && run bootcmd UBootStrategy: {} @@ -253,7 +253,7 @@ targets: init_commands: - setenv kernel_addr_r 0x2000000 - setenv bootargs earlyprintk console=ttyS0,115200 - - dhcp 0x2000000 openwrt-mvebu-cortexa9-cznic_turris-omnia-initramfs-kernel.bin + - dhcp 0x2000000 prplos-mvebu-cortexa9-cznic_turris-omnia-initramfs-kernel.bin boot_command: bootm 0x2000000 UBootStrategy: {} @@ -279,7 +279,7 @@ targets: init_commands: - setenv serverip 192.168.1.2 - setenv ipaddr 192.168.1.1 - - setenv fullimage openwrt-intel_x86-lgm-PRPL_OSP_TB341-osp_tb341_fullimage.img + - setenv fullimage prplos-intel_x86-lgm-PRPL_OSP_TB341-osp_tb341_fullimage.img - mmc dev 0 && mmc erase ${rootfs_data_block_start} ${rootfs_data_block_size} && run update_fullimage UBootStrategy: {} @@ -303,7 +303,7 @@ targets: init_commands: - setenv serverip 10.0.0.1 - setenv ipaddr 10.0.0.2 - boot_command: tftpboot openwrt-ipq95xx-prpl_freedom-initramfs-uImage.itb && bootm + boot_command: tftpboot prplos-ipq95xx-prpl_freedom-initramfs-uImage.itb && bootm boot_command_delay: 3 UBootStrategy: {} @@ -328,7 +328,7 @@ targets: - setenv serverip 10.0.0.1 - setenv ipaddr 10.0.0.2 - sleep 5 - - tftpboot 0x44000000 openwrt-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin + - tftpboot 0x44000000 prplos-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin - setenv untar_addr_kernel; setenv untar_addr_root; echo - untar 0x$fileaddr 0x$filesize kernel root - if test -n $untar_addr_kernel; then flash "0:HLOS" 0x$untar_addr_kernel 0x$untar_size_kernel; else echo "kernel is not found"; fi diff --git a/.testbed/labgrid/testbed-02.yaml b/.testbed/labgrid/testbed-02.yaml index 23a4776b13..a576b817e5 100644 --- a/.testbed/labgrid/testbed-02.yaml +++ b/.testbed/labgrid/testbed-02.yaml @@ -30,7 +30,7 @@ targets: - setenv ipaddr 192.168.1.1 boot_command_delay: 5 boot_timeout: 90 - boot_command: tftpboot 0x88000000 openwrt-ipq40xx-generic-glinet_gl-b1300-initramfs-fit-zImage.itb && bootm 0x88000000 + boot_command: tftpboot 0x88000000 prplos-ipq40xx-generic-glinet_gl-b1300-initramfs-fit-zImage.itb && bootm 0x88000000 UBootStrategy: {} glinet-b1300-nor: @@ -63,7 +63,7 @@ targets: - setenv ipaddr 192.168.1.1 boot_command_delay: 5 boot_timeout: 180 - boot_command: tftpboot 0x84000000 openwrt-ipq40xx-generic-glinet_gl-b1300-squashfs-sysupgrade.bin && sf probe && sf erase 0x180000 0x1e80000 && sf write 0x84000000 0x180000 $filesize && bootipq + boot_command: tftpboot 0x84000000 prplos-ipq40xx-generic-glinet_gl-b1300-squashfs-sysupgrade.bin && sf probe && sf erase 0x180000 0x1e80000 && sf write 0x84000000 0x180000 $filesize && bootipq UBootStrategy: {} prpl-haze-initramfs: @@ -91,7 +91,7 @@ targets: init_commands: - setenv serverip 10.0.0.1 - setenv ipaddr 10.0.0.2 - boot_command: tftpboot openwrt-ipq807x-generic-prpl_haze-initramfs-uImage.itb && bootm + boot_command: tftpboot prplos-ipq807x-generic-prpl_haze-initramfs-uImage.itb && bootm boot_command_delay: 3 UBootStrategy: {} @@ -122,7 +122,7 @@ targets: - setenv ipaddr 10.0.0.2 - sleep 5 - setenv untar_addr_kernel; setenv untar_addr_root; echo - - tftpboot openwrt-ipq807x-generic-prpl_haze-squashfs-sysupgrade.bin + - tftpboot prplos-ipq807x-generic-prpl_haze-squashfs-sysupgrade.bin - untar 0x$fileaddr 0x$filesize kernel root - if test -n $untar_addr_kernel; then flash "0:HLOS" 0x$untar_addr_kernel 0x$untar_size_kernel; else echo "kernel is not found"; fi - if test -n $untar_addr_root; then flash "rootfs" 0x$untar_addr_root 0x$untar_size_root; else echo "rootfs is not found"; fi @@ -156,7 +156,7 @@ targets: init_commands: - setenv serverip 192.168.1.2 - setenv ipaddr 192.168.1.1 - - setenv fullimage openwrt-intel_x86-lgm-LGM_PRPL-lgp_b0_pon_fullimage.img + - setenv fullimage prplos-intel_x86-lgm-LGM_PRPL-lgp_b0_pon_fullimage.img - mmc dev 0 && mmc erase ${rootfs_data_block_start} ${rootfs_data_block_size} && run update_fullimage UBootStrategy: {} @@ -185,7 +185,7 @@ targets: init_commands: - setenv serverip 10.0.0.1 - setenv ipaddr 10.0.0.2 - boot_command: tftpboot openwrt-ipq95xx-prpl_freedom-initramfs-uImage.itb && bootm + boot_command: tftpboot prplos-ipq95xx-prpl_freedom-initramfs-uImage.itb && bootm boot_command_delay: 3 UBootStrategy: {} @@ -215,7 +215,7 @@ targets: - setenv serverip 10.0.0.1 - setenv ipaddr 10.0.0.2 - sleep 5 - - tftpboot 0x44000000 openwrt-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin + - tftpboot 0x44000000 prplos-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin - setenv untar_addr_kernel; setenv untar_addr_root; echo - untar 0x$fileaddr 0x$filesize kernel root - if test -n $untar_addr_kernel; then flash "0:HLOS" 0x$untar_addr_kernel 0x$untar_size_kernel; else echo "kernel is not found"; fi @@ -249,6 +249,6 @@ targets: init_commands: - setenv serverip 192.168.1.2 - setenv ipaddr 192.168.1.1 - - setenv fullimage openwrt-intel_x86-lgm-PRPL_OSP_TB341_v2-osp_tb341_v2_wav700_eth_fullimage.img + - setenv fullimage prplos-intel_x86-lgm-PRPL_OSP_TB341_v2-osp_tb341_v2_wav700_eth_fullimage.img - mmc dev 0 && mmc erase ${overlay_container_a_block_start} ${overlay_container_a_block_size} && run update_fullimage UBootStrategy: {}