Skip to content

Commit e377b0e

Browse files
jlebonmarmijo
authored andcommitted
.cci.Jenkinsfile: drop Fedora CoreOS testing
It doesn't work properly against these rhcos- branches anyway. Let's just limit the testing to building the container and running check and unittest tests. (cherry picked from commit 86f8ce4)
1 parent 8f0ddff commit e377b0e

File tree

1 file changed

+1
-48
lines changed

1 file changed

+1
-48
lines changed

.cci.jenkinsfile

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -11,58 +11,11 @@ def cpuCount = 6
1111
def cpuCount_s = cpuCount.toString()
1212
def imageName = buildImage(env: [ENABLE_GO_RACE_DETECTOR: "1", GOMAXPROCS: cpuCount_s], cpu: cpuCount_s)
1313

14-
def memory = (cpuCount * 1536) as Integer
15-
pod(image: imageName + ":latest", kvm: true, cpu: "${cpuCount}", memory: "${memory}Mi") {
14+
pod(image: imageName + ":latest", cpu: "2", memory: "2048Mi") {
1615
checkout scm
1716

1817
stage("Unit tests") {
1918
shwrap("make check")
2019
shwrap("make unittest")
2120
}
22-
23-
shwrap("rpm -qa | sort > rpmdb.txt")
24-
archiveArtifacts artifacts: 'rpmdb.txt'
25-
26-
// Run stage Build FCOS (init, fetch and build)
27-
cosaBuild(skipKola: 1, cosaDir: "/srv", noForce: true)
28-
29-
// Run stage Kola QEMU (basic-qemu-scenarios, upgrade and self tests)
30-
kola(cosaDir: "/srv", addExtTests: ["${env.WORKSPACE}/ci/run-kola-self-tests"])
31-
32-
stage("Build Metal") {
33-
cosaParallelCmds(cosaDir: "/srv", commands: ["metal", "metal4k"])
34-
}
35-
36-
stage("Build Live Images") {
37-
// Explicitly test re-importing the ostree repo
38-
shwrap("cd /srv && rm tmp/repo -rf")
39-
utils.cosaCmd(cosaDir: "/srv", args: "buildextend-live --fast")
40-
}
41-
42-
kolaTestIso(cosaDir: "/srv")
43-
44-
stage("Build Cloud Images") {
45-
cosaParallelCmds(cosaDir: "/srv", commands: ["Aliyun", "AWS", "Azure", "DigitalOcean", "Exoscale", "GCP",
46-
"IBMCloud", "OpenStack", "VMware", "Vultr"])
47-
48-
// quick schema validation
49-
utils.cosaCmd(cosaDir: "/srv", args: "meta --get name")
50-
}
51-
52-
stage("Compress") {
53-
utils.cosaCmd(cosaDir: "/srv", args: "compress --fast")
54-
}
55-
56-
stage("Upload Dry Run") {
57-
utils.cosaCmd(cosaDir: "/srv", args: "buildupload --dry-run s3 --acl=public-read my-nonexistent-bucket/my/prefix")
58-
}
59-
60-
// Random other tests that aren't about building. XXX: These should be part of `make
61-
// check` or something and use dummy cosa builds.
62-
stage("CLI Tests") {
63-
shwrap("""
64-
cd /srv
65-
${env.WORKSPACE}/tests/test_pruning.sh
66-
""")
67-
}
6821
}

0 commit comments

Comments
 (0)