diff options
| -rw-r--r-- | .cci.jenkinsfile | 36 | ||||
| -rwxr-xr-x | ci/ci-commitmessage-submodules.sh | 6 |
2 files changed, 40 insertions, 2 deletions
diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile new file mode 100644 index 00000000..9acb34c5 --- /dev/null +++ b/.cci.jenkinsfile @@ -0,0 +1,36 @@ +// See https://github.com/jlebon/coreos-ci +// This was originally copied from the rpm-ostree one +@Library('github.com/coreos/coreos-ci-lib@master') _ + +COSA_IMAGE = 'quay.io/coreos-assembler/coreos-assembler:latest' +COSA_BUILDROOT_IMAGE = 'registry.svc.ci.openshift.org/coreos/cosa-buildroot:latest' + +stage("Build") { +parallel rpms: { + coreos.pod(image: COSA_BUILDROOT_IMAGE, runAsUser: 0) { + checkout scm + sh """ + set -xeuo pipefail + # fetch tags so `git describe` gives a nice NEVRA when building the RPM + git fetch origin --tags + git submodule update --init + + env NOCONFIGURE=1 ./autogen.sh + ./configure --with-openssl --with-curl --with-selinux + make + """ + } +}, +codestyle: { + coreos.pod(image: COSA_IMAGE) { + checkout scm + sh """ + set -xeuo pipefail + # Jenkins by default only fetches the branch it's testing. Explicitly fetch master + # for ci-commitmessage-submodules.sh + git fetch origin +refs/heads/master:refs/remotes/origin/master + ci/ci-commitmessage-submodules.sh + """ + } +} +} diff --git a/ci/ci-commitmessage-submodules.sh b/ci/ci-commitmessage-submodules.sh index 38481aaf..35d828e4 100755 --- a/ci/ci-commitmessage-submodules.sh +++ b/ci/ci-commitmessage-submodules.sh @@ -29,8 +29,10 @@ cleanup_tmp() { } trap cleanup_tmp EXIT -pkg_upgrade -pkg_install git +if ! [ -x /usr/bin/git ]; then + pkg_upgrade + pkg_install git +fi gitdir=$(realpath $(pwd)) # Create a temporary copy of this (using cp not git clone) so git doesn't |