Skip to content

Commit

Permalink
Update for CI: (#209)
Browse files Browse the repository at this point in the history
## Description

<!--- Please describe what this PR is going to change -->
Use existing image names from quay.io. remove old github actions ci
files. update mergify to not check for old ci.

## Why is this needed

<!--- Link to issue you have raised -->

Fixes: #

## How Has This Been Tested?
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->


## How are existing users impacted? What migration steps/scripts do we
need?

<!--- Fixes a bug, unblocks installation, removes a component of the
stack etc -->
<!--- Requires a DB migration script, etc. -->


## Checklist:

I have:

- [ ] updated the documentation and/or roadmap (if required)
- [ ] added unit or e2e tests
- [ ] provided instructions on how to upgrade
  • Loading branch information
jacobweinstock authored May 1, 2024
2 parents 04941d2 + b56d28b commit 3dd5735
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ queue_rules:
conditions:
# Conditions to get out of the queue (= merged)
- check-success=DCO
- check-success~=validation$

pull_request_rules:
- name: Automatic merge on approval
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion bash/kernel/kernel_default.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function calculate_kernel_version_default() {
kernel_id_to_use="${USE_KERNEL_ID}"
fi

kernel_oci_image="${HOOK_KERNEL_OCI_BASE}${kernel_id_to_use}:${kernel_oci_version}"
kernel_oci_image="${HOOK_KERNEL_OCI_BASE}:${kernel_oci_version}"

# Log the obtained version & images to stderr
log info "Kernel arch: ${KERNEL_ARCH} (for ARCH ${ARCH})"
Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ parse_command_line_arguments "${@}" # which fills the above vars & exports the k
# 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

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

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

Expand Down

0 comments on commit 3dd5735

Please sign in to comment.