Skip to content

Commit

Permalink
Merge pull request coreos#513 from cgwalters/fix-ci
Browse files Browse the repository at this point in the history
ci: Rework to split build/test
  • Loading branch information
openshift-merge-robot authored Mar 10, 2021
2 parents f413417 + fceaa1d commit eeedfbf
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 25 deletions.
5 changes: 0 additions & 5 deletions Dockerfile

This file was deleted.

5 changes: 5 additions & 0 deletions ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# For CI on a config git repo, all we need to do is combine
# the source code with coreos-assembler into an image to test.
FROM registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
WORKDIR /src
COPY . .
25 changes: 25 additions & 0 deletions ci/build-test-qemu.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash
set -xeuo pipefail
# Prow jobs don't support adding emptydir today
export COSA_SKIP_OVERLAY=1
# We generate .repo files which write to the source, but
# we captured the source as part of the Docker build.
# In OpenShift default SCC we'll run as non-root, so we need
# to make a new copy of the source. TODO fix cosa to be happy
# if src/config already exists instead of wanting to reference
# it or clone it. Or we could write our .repo files to a separate
# place.
tmpsrc=$(mktemp -d)
cp -a /src ${tmpsrc}/src
# Create a temporary cosa workdir
cd $(mktemp -d)
cosa init ${tmpsrc}/src
# TODO query the 4-8 bits from manifest.yaml or so
curl -L http://base-4-8-rhel8.ocp.svc.cluster.local > src/config/ocp.repo
cosa fetch
cosa build
cosa kola --basic-qemu-scenarios
cosa kola run 'ext.*'
# TODO: all tests in the future, but there are a lot
# and we want multiple tiers, and we need to split them
# into multiple pods and stuff.
20 changes: 0 additions & 20 deletions ci/build-test.sh

This file was deleted.

1 change: 1 addition & 0 deletions ci/build-test.sh
6 changes: 6 additions & 0 deletions ci/validate.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
set -xeuo pipefail
# First ensure submodules are initialized
git submodule update --init --recursive
# Basic syntax check
./fedora-coreos-config/ci/validate

0 comments on commit eeedfbf

Please sign in to comment.