Skip to content

Commit

Permalink
Bring back cosa_controller_img knob, drop hack status
Browse files Browse the repository at this point in the history
The podman remote feature assumes that the version on the client
and the one on the host match versions, within some margin. So the
`cosa_controller_img` knob we had before was useful.

This reverts commit dbad52b. But:
1. we drop the `_hack` suffix and update the documentation
2. the default is to always use the `:main` cosa image, which most of
   the time will have a podman remote matching the FCOS version on the
   builder (except for that small period of time during a major rebase
   when FCOS is ahead of cosa)

Motivated by our pipeline hitting
containers/podman#22531
due to most FCOS streams being on f40 and cosa still being on f39.
  • Loading branch information
jlebon authored and aaradhak committed May 14, 2024
1 parent 463acca commit 95d2706
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
3 changes: 3 additions & 0 deletions docs/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ streams:
- vmware
# OPTIONAL: override default coreos-assembler image to build with
cosa_img: quay.io/coreos-assembler/coreos-assembler:stable
# OPTIONAL: Override default coreos-assembler image to use for
# the controller pod in the build-arch job (default is :main)
cosa_controller_img: quay.io/coreos-assembler/coreos-assembler:next
# OPTIONAL: override additional architectures to build for
additional_arches:
- s390x
Expand Down
4 changes: 3 additions & 1 deletion jobs/build-arch.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ cosa_img = cosa_img ?: pipeutils.get_cosa_img(pipecfg, params.STREAM)

def stream_info = pipecfg.streams[params.STREAM]

def cosa_controller_img = stream_info.cosa_controller_img ?: "quay.io/coreos-assembler/coreos-assembler:main"

// Grab any environment variables we should set
def container_env = pipeutils.get_env_vars_for_stream(pipecfg, params.STREAM)

Expand Down Expand Up @@ -110,7 +112,7 @@ lock(resource: "release-${params.VERSION}-${basearch}") {
lock(resource: "build-${params.STREAM}-${basearch}") {
cosaPod(cpu: "${ncpus}",
memory: "${cosa_memory_request_mb}Mi",
image: cosa_img,
image: cosa_controller_img,
env: container_env,
serviceAccount: "jenkins") {
timeout(time: timeout_mins, unit: 'MINUTES') {
Expand Down
5 changes: 4 additions & 1 deletion jobs/debug-pod.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ def stream_info = pipecfg.streams[params.STREAM]
// Grab any environment variables we should set
def container_env = pipeutils.get_env_vars_for_stream(pipecfg, params.STREAM)

// We'll just always use main for the controller image here.
def cosa_controller_img = "quay.io/coreos-assembler/coreos-assembler:main"

// Note that the heavy lifting is done on a remote node via podman
// --remote so we shouldn't need much memory or CPU.
def cosa_memory_request_mb = 512
Expand All @@ -56,7 +59,7 @@ podName += UUID.randomUUID().toString().substring(0, 8)

cosaPod(cpu: "${ncpus}",
memory: "${cosa_memory_request_mb}Mi",
image: cosa_img,
image: cosa_controller_img,
env: container_env,
serviceAccount: "jenkins",
name : podName) {
Expand Down

0 comments on commit 95d2706

Please sign in to comment.