Skip to content

Commit

Permalink
Merge pull request #174 from cgwalters/ci-update
Browse files Browse the repository at this point in the history
ci: Update to latest buildroot model
  • Loading branch information
jlebon authored Apr 26, 2021
2 parents 794a132 + 63c6e65 commit f909058
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .cci.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
stage("Build") {
parallel build: {
def n = 5
cosaPod(buildroot: true, runAsUser: 0, memory: "2Gi", cpu: "${n}") {
buildPod(runAsUser: 0, memory: "2Gi", cpu: "${n}") {
checkout scm
stage("Core build") {
shwrap("""
Expand All @@ -23,7 +23,7 @@ parallel build: {
}
},
codestyle: {
cosaPod(buildroot: true) {
buildPod {
checkout scm
shwrap("cargo fmt -- --check")
}
Expand All @@ -32,7 +32,7 @@ codestyle: {

// Build FCOS and do a kola basic run
// FIXME update to main branch once https://github.com/coreos/fedora-coreos-config/pull/595 merges
cosaPod(buildroot: true, runAsUser: 0, memory: "3072Mi", cpu: "4") {
cosaPod(runAsUser: 0, memory: "3072Mi", cpu: "4") {
stage("Build FCOS") {
checkout scm
unstash 'build'
Expand Down
4 changes: 2 additions & 2 deletions ci/prow/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM registry.ci.openshift.org/coreos/cosa-buildroot:latest as builder
FROM quay.io/coreos-assembler/fcos-buildroot:testing-devel as builder
WORKDIR /src
COPY . .
RUN make && make install DESTDIR=/cosa/component-install
RUN make -C tests/kolainst install DESTDIR=/cosa/component-tests
# Uncomment this to fake a build to test the code below
# RUN mkdir -p /cosa/component-install/usr/bin && echo foo > /cosa/component-install/usr/bin/foo

FROM registry.ci.openshift.org/coreos/coreos-assembler:latest
FROM quay.io/coreos-assembler/coreos-assembler:latest
WORKDIR /srv
# Install our built binaries as overrides for the target build
COPY --from=builder /cosa/component-install/ /srv/overrides/rootfs/
Expand Down

0 comments on commit f909058

Please sign in to comment.