Skip to content
Snippets Groups Projects
Commit 43f1cac9 authored by Mick Jordan's avatar Mick Jordan
Browse files

pkgtest: fix for count.daily; revert ci.hocon

parent f963da53
Branches
No related tags found
No related merge requests found
...@@ -51,44 +51,8 @@ gateStyle : ${common} { ...@@ -51,44 +51,8 @@ gateStyle : ${common} {
# currently disabled gate commands: FindBugs,Checkheaders,Distribution Overlap Check,BuildJavaWithEcj # currently disabled gate commands: FindBugs,Checkheaders,Distribution Overlap Check,BuildJavaWithEcj
# tests a (default) number of packages known to install correctly
pkgtest: ${common} ${java8Downloads} {
timelimit : "3:00:00"
setup : [
["git", "clone", "--depth", "1", ${repoBase}"gnur.git", "../gnur"]
]
run : [
["mx", "-v", "--dynamicimport", "gnur", "build", "--serial"]
["mx", "--dynamicimport", "gnur", "pkgtest", "--print-ok-installs", "--ok-only"]
]
}
# tests a (default) number of packages known to install correctly
pkgtestDaily: ${common} ${java8Downloads} {
timelimit : "3:00:00"
setup : [
["git", "clone", "--depth", "1", ${repoBase}"gnur.git", "../gnur"]
]
run : [
["mx", "-v", "--dynamicimport", "gnur", "build", "--serial"]
["mx", "--dynamicimport", "gnur", "pkgtest", "--print-ok-installs", "--count-daily", "100"]
]
}
# tries to install a (default) number of packages previously known not to install
pkginstall: ${common} ${java8Downloads} {
timelimit : "6:00:00"
run : [
["mx", "build"]
["mx", "pkgtest", "--invert-pkgset", "--ok-only", "--install-only", "--print-ok-installs", "--install-dependents-first", "--pkg-count", "1000"]
]
}
builds = [ builds = [
${gateTest} {capabilities : [linux, amd64, gate, post-merge], name: "gate-test-linux-amd64"} ${gateTest} {capabilities : [linux, amd64, gate, post-merge], name: "gate-test-linux-amd64"}
${gateStyle} {capabilities : [linux, amd64, gate, post-merge], name: "gate-style-linux-amd64"} ${gateStyle} {capabilities : [linux, amd64, gate, post-merge], name: "gate-style-linux-amd64"}
# ${gateTest} {capabilities : [linux, sparcv9, gate, post-merge], name: "gate-test-linux-sparcv9"} # ${gateTest} {capabilities : [linux, sparcv9, gate, post-merge], name: "gate-test-linux-sparcv9"}
# ${pkgtest} {capabilities : [linux, amd64, gate], name: "pkgtest-linux-amd64"}
${pkgtestDaily} {capabilities : [linux, amd64, gate], name: "pkgtest-daily-linux-amd64"}
# ${pkginstall} {capabilities : [linux, amd64, gate], name: "pkginstall-linux-amd64"}
] ]
...@@ -499,7 +499,7 @@ do.it <- function() { ...@@ -499,7 +499,7 @@ do.it <- function() {
yday <- as.POSIXlt(Sys.Date())$yday yday <- as.POSIXlt(Sys.Date())$yday
chunk <- as.integer(npkgs / count.daily) chunk <- as.integer(npkgs / count.daily)
start <- (yday %% chunk) * count.daily start <- (yday %% chunk) * count.daily
end <- ifelse(start + count.daily > npkgs, npkgs, start + count.daily) end <- ifelse(start + count.daily > npkgs, npkgs, start + count.daily - 1)
test.pkgnames <- test.pkgnames[start:end] test.pkgnames <- test.pkgnames[start:end]
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment