OKD-152: Add layered build for OKD-SCOS #46
Conversation
| securityContext: | ||
| privileged: true | ||
| script: | | ||
| #!/usr/bin/env bash |
There was a problem hiding this comment.
Could this Task be separated in future and run in a separate pipeline (like the 'future' payload one, as we can do for okd/fcos) and maintain the coreos pipeline to only build the base os?
There was a problem hiding this comment.
yes, it's definitely the plan to buid base and layer(s) separately!
I'd like to be able to have one pipeline that can be flexibly configured either way, but nothing will stop you from creating a completely separate pipeline with that task, or even run it as a task run.
LorbusChris
changed the title
LorbusChris
force-pushed
the
layered-build
branch
from
399e15d to
23c92a5
Compare
LorbusChris
force-pushed
the
layered-build
branch
from
23c92a5 to
ef77b94
Compare
sherine-k
force-pushed
the
layered-build
branch
2 times, most recently
from
5888931 to
5a09efb
Compare
| @@ -12,9 +12,9 @@ spec: | |||
| script: | | |||
| #!/usr/bin/env bash | |||
| set -euxo pipefail | |||
|
|
|||
There was a problem hiding this comment.
nit: whitespaces
| dnf install -y jq | ||
|
|
||
There was a problem hiding this comment.
nit: whitespaces
| @@ -27,7 +27,7 @@ spec: | |||
| sed -i 's/RPM-GPG-KEY-CentOS-Official/RPM-GPG-KEY-centosofficial/g' src/config/c9s.repo | |||
|
|
|||
| cat <<EOF >> src/config/Dockerfile | |||
| FROM scos | |||
| FROM quay.io/okd/centos-stream-coreos-9:4.14-x86_64 | |||
There was a problem hiding this comment.
This might be nice as a parameter
sherine-k
force-pushed
the
layered-build
branch
from
5a09efb to
a8c250c
Compare
|
|
||
| cat <<EOF >> src/config/Dockerfile | ||
| FROM quay.io/okd/centos-stream-coreos-9:4.14-x86_64 | ||
| COPY rpms/ /srv/coreos/rpms/ |
There was a problem hiding this comment.
It should be COPY rpms/ /workspace/coreos/rpms/ since this commit 067ce9d
Otherwise we are hitting the issue below :
error: Updating rpm-md repo 'artifacts': /workspace/coreos/rpms/ was not found during the step STEP 5/6: RUN cat /etc/os-release && rpm-ostree --version && ostree --version && rpm-ostree ex rebuild && rpm-ostree cleanup -m && rm -rf /var/lib/unbound /srv/coreos/rpms /etc/rpm-ostree/origin.d /etc/yum.repos.d/c9s.repo && ostree container commit
| results: | ||
| - name: output | ||
| workspaces: | ||
| - mountPath: /srv |
There was a problem hiding this comment.
For consistency with 067ce9d we should use /workspace
There was a problem hiding this comment.
And, replace all the references of /srv by /workspace in the script
|
|
||
| workspaces: | ||
| - name: regcred | ||
| - mountPath: /srv |
There was a problem hiding this comment.
| workspaces: | ||
| - name: ws | ||
| workspace: shared-workspace | ||
| - name: build-layer |
There was a problem hiding this comment.
Maybe we should run the build-layer task after cosa-test and cosa-upload-baseos in order to pull the freshly baseos built during cosa-build-baseos task of the current pipeline. Otherwise, we would pull the baseos image from the latest pipeline run
Splits SCOS into a base and an OKD layer.
Tested locally.
/cc @sherine-k @travier