Skip to content

kt vm: Pin Rocky repos to vault to prevent minor version drift #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
roxanan1996 wants to merge 1 commit into
base: mainline
Choose a base branch
from
Open

kt vm: Pin Rocky repos to vault to prevent minor version drift #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions kt/data/cloud_init.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@ ssh_pwauth: true
package_upgrade: False

mounts:
- ["mount_tag_mock_scratch", "SHARED_DIR_PLACEHOLDER", "virtiofs", "rw,relatime,context=unconfined_u:object_r:mock_var_lib_t:s0"]
- ["SHARED_DIR_PLACEHOLDER", "/var/lib/mock", "bind", "defaults,bind"]
- - mount_tag_mock_scratch
- SHARED_DIR_PLACEHOLDER
- virtiofs
- rw,relatime,context=unconfined_u:object_r:mock_var_lib_t:s0
- - SHARED_DIR_PLACEHOLDER
- /var/lib/mock
- bind
- defaults,bind

# Change working directory after boot
# Setting up homedir does not work without tricks, because
Expand All @@ -32,4 +38,10 @@ write_files:
# and then root is the owner
# workaround to change the owner to user
runcmd:
- [chown, USER_PLACEHOLDER:USER_PLACEHOLDER, HOMEDIR_PLACEHOLDER]
- - chown
- USER_PLACEHOLDER:USER_PLACEHOLDER
- HOMEDIR_PLACEHOLDER
- find /etc/yum.repos.d/ -iname "*.repo" -exec sed -i 's|^mirrorlist=|#mirrorlist=|g' {} \;
- find /etc/yum.repos.d/ -iname "*.repo" -exec sed -i 's|^#baseurl=http://dl.rockylinux.org/$contentdir|baseurl=https://dl.rockylinux.org/vault/rocky|g' {} \;
Comment thread
roxanan1996 marked this conversation as resolved.
- find /etc/yum.repos.d/ -iname "*.repo" -exec sed -i "s|\$releasever|$(. /etc/os-release && echo $VERSION_ID)|g" {} \;
Comment thread
roxanan1996 marked this conversation as resolved.
Comment thread
roxanan1996 marked this conversation as resolved.
Comment on lines +44 to +46

@PlaidCat PlaidCat Jun 4, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sorry I'm just now getting to this:

There is a little simpler way to do pinning.

https://github.com/ctrliq/kernel-src-tree/wiki#pin-to-vault

Feel free to rewrite the awk if you want.

@roxanan1996 roxanan1996 Jun 8, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, this looks better as it just sets env variables instead of manually rewriting them in the repo files.
But, on friday, I ran into issues for all 9.x kernels because of epel-cisco-openh264. There is only one repo for 9. And what I don't understand is that the repo files already use 9.X, so there is no nice way to override that only for this repo.

I do not even know why we need this in the first place, maybe I can disable it..
I'll sleep on this a bit, I was busy with other stuff.

@PlaidCat PlaidCat Jun 8, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm actually not sure why the cisco stuff would be there, its on my host machine ... and I couldn't tell you why exactly but none of the VM images i create has it installed for the guest vm

- dnf clean all
11 changes: 8 additions & 3 deletions kt/ktlib/vm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import time
from dataclasses import dataclass

import oyaml as yaml
import wget
from git import Repo
from pathlib3x import Path
from ruamel.yaml import YAML

from kt.ktlib.config import Config
from kt.ktlib.kernel_workspace import KernelWorkspace
Expand Down Expand Up @@ -157,9 +157,15 @@ def _download_source_image(self, override_base: bool = False):
wget.download(self._get_vm_url(), out=str(self.qcow2_source_path))

def _setup_cloud_init(self, config: Config):
yaml = YAML()
yaml.preserve_quotes = True
yaml.width = 4096
yaml.default_flow_style = False
yaml.best_sequence_indent = 2

data = None
with open(CLOUD_INIT_BASE_PATH) as f:
data = yaml.safe_load(f)
data = yaml.load(f)

# replace placeholders with user data
data["users"][0]["name"] = config.user
Expand Down Expand Up @@ -189,7 +195,6 @@ def _setup_cloud_init(self, config: Config):
data["runcmd"].append([str(config.base_path / Path("kernel-src-tree-tools") / Path("kernel_install_dep.sh"))])
# Write this to image cloud_init
with open(self.cloud_init_path, "w") as f:
f.write("#cloud-config\n")
yaml.dump(data, f)

def _create_image(self, config: Config, vcpus: int = 12, memory: int = 32768):
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ dependencies = [
"click",
"pathlib3x",
"python3-wget",
"oyaml",
"ruamel.yaml",
Comment thread
roxanan1996 marked this conversation as resolved.
"pyyaml",
"pexpect",
"jira",
"requests",
Expand Down