Skip to content

Commit

Permalink
Adjusting ORAS cache location, runners (armbian#5129)
Browse files Browse the repository at this point in the history 
* Move packages to new location
* Adjust build runners
* Switch to OS

Signed-off-by: Igor <igor@armbian.com>
---------

Signed-off-by: Igor <igor@armbian.com>
Co-authored-by: Ricardo Pardini <ricardo@pardini.net>
  • Loading branch information
@igorpecovnik @rpardini
igorpecovnik and rpardini authored May 2, 2023
1 parent 64f434a commit ba1a84a
Show file tree
Hide file tree
Showing 17 changed files with 23 additions and 23 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ ubuntu-*-cloudimg-console.log
.DS_Store
*~
*.swp
/__pycache__/*

# Mainly generated by merge tools like 'meld'
*.orig
Expand Down
0 config/boards/bananapir2.csc → config/boards/bananapir2.eos
View file
File renamed without changes.
0 config/boards/macchiatobin-doubleshot.csc → config/boards/macchiatobin-doubleshot.eos
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/functions/artifacts/artifact-armbian-bsp-cli.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function artifact_armbian-bsp-cli_cli_adapter_config_prep() {
}

function artifact_armbian-bsp-cli_get_default_oci_target() {
artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-packages/"
artifact_oci_target_base="${GHCR_SOURCE}/armbian/os/"
}

function artifact_armbian-bsp-cli_is_available_in_local_cache() {
Expand Down
2 changes: 1 addition & 1 deletion lib/functions/artifacts/artifact-armbian-bsp-desktop.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function artifact_armbian-bsp-desktop_cli_adapter_config_prep() {
}

function artifact_armbian-bsp-desktop_get_default_oci_target() {
artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-packages/"
artifact_oci_target_base="${GHCR_SOURCE}/armbian/os/"
}

function artifact_armbian-bsp-desktop_is_available_in_local_cache() {
Expand Down
2 changes: 1 addition & 1 deletion lib/functions/artifacts/artifact-armbian-config.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ function artifact_armbian-config_cli_adapter_config_prep() {
}

function artifact_armbian-config_get_default_oci_target() {
artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-packages/"
artifact_oci_target_base="${GHCR_SOURCE}/armbian/os/"
}

function artifact_armbian-config_is_available_in_local_cache() {
Expand Down
2 changes: 1 addition & 1 deletion lib/functions/artifacts/artifact-armbian-desktop.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ function artifact_armbian-desktop_cli_adapter_config_prep() {
}

function artifact_armbian-desktop_get_default_oci_target() {
artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-packages/"
artifact_oci_target_base="${GHCR_SOURCE}/armbian/os/"
}

function artifact_armbian-desktop_is_available_in_local_cache() {
Expand Down
2 changes: 1 addition & 1 deletion lib/functions/artifacts/artifact-armbian-plymouth-theme.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function artifact_armbian-plymouth-theme_cli_adapter_config_prep() {
}

function artifact_armbian-plymouth-theme_get_default_oci_target() {
artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-packages/"
artifact_oci_target_base="${GHCR_SOURCE}/armbian/os/"
}

function artifact_armbian-plymouth-theme_is_available_in_local_cache() {
Expand Down
2 changes: 1 addition & 1 deletion lib/functions/artifacts/artifact-armbian-zsh.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function artifact_armbian-zsh_cli_adapter_config_prep() {
}

function artifact_armbian-zsh_get_default_oci_target() {
artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-packages/"
artifact_oci_target_base="${GHCR_SOURCE}/armbian/os/"
}

function artifact_armbian-zsh_is_available_in_local_cache() {
Expand Down
2 changes: 1 addition & 1 deletion lib/functions/artifacts/artifact-fake-ubuntu-advantage-tools.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function artifact_fake_ubuntu_advantage_tools_cli_adapter_config_prep() {
}

function artifact_fake_ubuntu_advantage_tools_get_default_oci_target() {
artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-packages/"
artifact_oci_target_base="${GHCR_SOURCE}/armbian/os/"
}

function artifact_fake_ubuntu_advantage_tools_is_available_in_local_cache() {
Expand Down
2 changes: 1 addition & 1 deletion lib/functions/artifacts/artifact-firmware.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function artifact_firmware_cli_adapter_config_prep() {
}

function artifact_firmware_get_default_oci_target() {
artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-firmware/"
artifact_oci_target_base="${GHCR_SOURCE}/armbian/os/"
}

function artifact_firmware_is_available_in_local_cache() {
Expand Down
2 changes: 1 addition & 1 deletion lib/functions/artifacts/artifact-full_firmware.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function artifact_full_firmware_cli_adapter_config_prep() {
}

function artifact_full_firmware_get_default_oci_target() {
artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-firmware/"
artifact_oci_target_base="${GHCR_SOURCE}/armbian/os/"
}

function artifact_full_firmware_is_available_in_local_cache() {
Expand Down
2 changes: 1 addition & 1 deletion lib/functions/artifacts/artifact-kernel.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ function artifact_kernel_cli_adapter_config_prep() {
}

function artifact_kernel_get_default_oci_target() {
artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-kernel/"
artifact_oci_target_base="${GHCR_SOURCE}/armbian/os/"
}

function artifact_kernel_is_available_in_local_cache() {
Expand Down
2 changes: 1 addition & 1 deletion lib/functions/artifacts/artifact-rootfs.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ function artifact_rootfs_cli_adapter_config_prep() {
}

function artifact_rootfs_get_default_oci_target() {
artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-root/"
artifact_oci_target_base="${GHCR_SOURCE}/armbian/os/"
}

function artifact_rootfs_is_available_in_local_cache() {
Expand Down
2 changes: 1 addition & 1 deletion lib/functions/artifacts/artifact-uboot.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ function artifact_uboot_cli_adapter_config_prep() {
}

function artifact_uboot_get_default_oci_target() {
artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-uboot/"
artifact_oci_target_base="${GHCR_SOURCE}/armbian/os/"
}

function artifact_uboot_is_available_in_local_cache() {
Expand Down
8 changes: 4 additions & 4 deletions lib/tools/info/output-gha-matrix.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def generate_matrix_images(info) -> list[dict]:
runs_on = "ubuntu-latest"
image_arch = image['out']['ARCH']
if image_arch in ["arm64"]: # , "armhf"
runs_on = ["self-hosted", "Linux", 'armbian', f"image-{image_arch}"]
runs_on = ["self-hosted", "Linux", f"image-{image_arch}"]

inputs = image['in']
cmds = (armbian_utils.map_to_armbian_params(inputs["vars"]) + inputs["configs"]) # image build is "build" command, omitted here
Expand All @@ -66,19 +66,19 @@ def generate_matrix_artifacts(info):
desc = f"{artifact['out']['artifact_final_file_basename']}"

# runs_in = ["self-hosted", "Linux", 'armbian', f"artifact-{artifact_name}"]
runs_on = "ubuntu-latest"
runs_on = "fast"

# @TODO: externalize this logic.

# rootfs's fo arm64 are built on self-hosted runners tagged with "rootfs-<arch>"
if artifact_name in ["rootfs"]:
rootfs_arch = artifact['in']['inputs']['ARCH'] # @TODO we should resolve arch _much_ ealier in the pipeline and make it standard
if rootfs_arch in ["arm64"]: # (future: add armhf)
runs_on = ["self-hosted", "Linux", 'armbian', f"rootfs-{rootfs_arch}"]
runs_on = ["self-hosted", "Linux", f"rootfs-{rootfs_arch}"]

# all kernels are built on self-hosted runners.
if artifact_name in ["kernel"]:
runs_on = ["self-hosted", "Linux", 'armbian', f"artifact-{artifact_name}"]
runs_on = ["self-hosted", "Linux", 'alfa']

inputs = artifact['in']['original_inputs']
cmds = (["artifact"] + armbian_utils.map_to_armbian_params(inputs["vars"]) + inputs["configs"])
Expand Down
13 changes: 6 additions & 7 deletions lib/tools/info/output-gha-workflow.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def prepare_gh_releases_step(self):

# Create prepare job
pJob: PrepareJob = PrepareJob(f"prepare", f"prepare all")
pJob.set_runs_on(["self-hosted", "Linux", 'armbian', "matrix-prepare"]) # @TODO: de-hardcode?
pJob.set_runs_on(["self-hosted", "Linux", "matrix-prepare"]) # @TODO: de-hardcode?
pJob.add_initial_checkout()
pJob.add_cache_restore_step()

Expand Down Expand Up @@ -139,19 +139,19 @@ def prepare_gh_releases_step(self):
desc = f"{artifact['out']['artifact_name']}"

# runs_in = ["self-hosted", "Linux", 'armbian', f"artifact-{artifact_name}"]
runs_on = "ubuntu-latest"
runs_on = "fast"

# @TODO: externalize this logic.

# rootfs's fo arm64 are built on self-hosted runners tagged with "rootfs-<arch>"
if artifact_name in ["rootfs"]:
rootfs_arch = artifact['in']['inputs']['ARCH'] # @TODO we should resolve arch _much_ ealier in the pipeline and make it standard
if rootfs_arch in ["arm64"]: # (future: add armhf)
runs_on = ["self-hosted", "Linux", 'armbian', f"rootfs-{rootfs_arch}"]
runs_on = ["self-hosted", "Linux", f"rootfs-{rootfs_arch}"]

# all kernels are built on self-hosted runners.
if artifact_name in ["kernel"]:
runs_on = ["self-hosted", "Linux", 'armbian', f"artifact-{artifact_name}"]
runs_on = ["self-hosted", "Linux", "alfa"]

inputs = artifact['in']['original_inputs']
cmds = (["artifact"] + armbian_utils.map_to_armbian_params(inputs["vars"]) + inputs["configs"])
Expand Down Expand Up @@ -189,11 +189,10 @@ def prepare_gh_releases_step(self):
# continue

desc = f"{image['image_file_id']} {image_id}"

runs_on = "ubuntu-latest"
runs_on = "fast"
image_arch = image['out']['ARCH']
if image_arch in ["arm64"]: # , "armhf"
runs_on = ["self-hosted", "Linux", 'armbian', f"image-{image_arch}"]
runs_on = ["self-hosted", "Linux", f"image-{image_arch}"]

inputs = image['in']
cmds = (armbian_utils.map_to_armbian_params(inputs["vars"]) + inputs["configs"]) # image build is "build" command, omitted here
Expand Down

0 comments on commit ba1a84a

Please sign in to comment.