diff options
| author | Jonathan Lebon <jonathan@jlebon.com> | 2022-10-13 09:16:19 -0400 |
|---|---|---|
| committer | Jonathan Lebon <jonathan@jlebon.com> | 2022-10-13 09:16:19 -0400 |
| commit | 139759dd7e6315c2e186f88ee34bcd016d43b4fe (patch) | |
| tree | 9e96deec3f5cde5796311dec1e5c5d41be95ab57 /.cci.jenkinsfile | |
| parent | d5129e3766dfc4221355e6c19c5ab0ac2def75ce (diff) | |
| download | ostree-139759dd7e6315c2e186f88ee34bcd016d43b4fe.tar.gz | |
ci: Drop unnecessary outer stage
We define stages inside of this stage, so get rid of the outer `FCOS`
stage. This should help rendering the pipeline in BlueOcean more
clearly.
Diffstat (limited to '.cci.jenkinsfile')
| -rw-r--r-- | .cci.jenkinsfile | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile index ce292899..6ec51c39 100644 --- a/.cci.jenkinsfile +++ b/.cci.jenkinsfile @@ -42,29 +42,27 @@ stage("Build") { // Build FCOS and run kola tests. // Both fcosKola and fcosKolaTestIso require 4G max. Add 512M for overhead. -stage("FCOS") { - cosaPod(runAsUser: 0, memory: "4608Mi", cpu: "4") { - stage("Build FCOS") { - checkout scm - unstash 'build' - shwrap(""" - # Move the bits into the cosa pod - rsync -rlv installed/rootfs/ / - rsync -rlv installed/tests/ / - coreos-assembler init --force https://github.com/coreos/fedora-coreos-config - mkdir -p overrides/rootfs - # And override the on-host bits - mv installed/rootfs/* overrides/rootfs/ - rm installed -rf - coreos-assembler fetch - coreos-assembler build - coreos-assembler buildextend-metal - coreos-assembler buildextend-metal4k - coreos-assembler buildextend-live --fast +cosaPod(runAsUser: 0, memory: "4608Mi", cpu: "4") { + stage("Build FCOS") { + checkout scm + unstash 'build' + shwrap(""" + # Move the bits into the cosa pod + rsync -rlv installed/rootfs/ / + rsync -rlv installed/tests/ / + coreos-assembler init --force https://github.com/coreos/fedora-coreos-config + mkdir -p overrides/rootfs + # And override the on-host bits + mv installed/rootfs/* overrides/rootfs/ + rm installed -rf + coreos-assembler fetch + coreos-assembler build + coreos-assembler buildextend-metal + coreos-assembler buildextend-metal4k + coreos-assembler buildextend-live --fast - """) - } - fcosKola(cosaDir: "${env.WORKSPACE}") - fcosKolaTestIso(cosaDir: "${env.WORKSPACE}", skipMetal4k: true, skipMultipath: true) + """) } + fcosKola(cosaDir: "${env.WORKSPACE}") + fcosKolaTestIso(cosaDir: "${env.WORKSPACE}", skipMetal4k: true, skipMultipath: true) } |