Skip to content

Commit b56d28b

Browse files
Update for CI:
Use existing image names from quay.io. remove old github actions ci files. update mergify to not check for old ci. Signed-off-by: Jacob Weinstock <jakobweinstock@gmail.com>
1 parent 04941d2 commit b56d28b

File tree

7 files changed

+3
-4
lines changed

7 files changed

+3
-4
lines changed

.github/mergify.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ queue_rules:
33
conditions:
44
# Conditions to get out of the queue (= merged)
55
- check-success=DCO
6-
- check-success~=validation$
76

87
pull_request_rules:
98
- name: Automatic merge on approval
File renamed without changes.
File renamed without changes.
File renamed without changes.

bash/kernel/kernel_default.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ function calculate_kernel_version_default() {
6262
kernel_id_to_use="${USE_KERNEL_ID}"
6363
fi
6464

65-
kernel_oci_image="${HOOK_KERNEL_OCI_BASE}${kernel_id_to_use}:${kernel_oci_version}"
65+
kernel_oci_image="${HOOK_KERNEL_OCI_BASE}:${kernel_oci_version}"
6666

6767
# Log the obtained version & images to stderr
6868
log info "Kernel arch: ${KERNEL_ARCH} (for ARCH ${ARCH})"

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ parse_command_line_arguments "${@}" # which fills the above vars & exports the k
2323
# From here on, no more $1 ${1} or similar. We've parsed it all into CLI_PARSED_CMDLINE_PARAMS (already exported in environment) or CLI_NON_PARAM_ARGS
2424

2525
### Configuration
26-
declare -g HOOK_KERNEL_OCI_BASE="${HOOK_KERNEL_OCI_BASE:-"quay.io/tinkerbell/kernel-"}"
27-
declare -g HOOK_LK_CONTAINERS_OCI_BASE="${HOOK_LK_CONTAINERS_OCI_BASE:-"quay.io/tinkerbell/linuxkit-"}"
26+
declare -g HOOK_KERNEL_OCI_BASE="${HOOK_KERNEL_OCI_BASE:-"quay.io/tinkerbell/hook-kernel"}"
27+
declare -g HOOK_LK_CONTAINERS_OCI_BASE="${HOOK_LK_CONTAINERS_OCI_BASE:-"quay.io/tinkerbell/"}"
2828

2929
declare -g SKOPEO_IMAGE="${SKOPEO_IMAGE:-"quay.io/skopeo/stable:latest"}"
3030

0 commit comments

Comments
 (0)