infra: Remove quick/full split.

Full should be fast enough now.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
This commit is contained in:
Tim 'mithro' Ansell 2019-01-31 20:23:55 +11:00
parent d27dfd541a
commit 2d8d4832f1
10 changed files with 29 additions and 163 deletions

View File

@ -1,32 +0,0 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "symbiflow-prjxray-continuous-db-artix7-quick/.github/kokoro/db-quick.sh"
timeout_mins: 180
action {
define_artifacts {
regex: "**/*result*.xml"
regex: "**/*.log"
}
}
env_vars {
key: "KOKORO_TYPE"
value: "continuous"
}
env_vars {
key: "KOKORO_DIR"
value: "symbiflow-prjxray-continuous-db-artix7-quick"
}
env_vars {
key: "XRAY_SETTINGS"
value: "artix7"
}
env_vars {
key: "XRAY_BUILD_TYPE"
value: "quick"
}

View File

@ -1,6 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "symbiflow-prjxray-continuous-db-artix7-full/.github/kokoro/db-full.sh"
build_file: "symbiflow-prjxray-continuous-db-artix7/.github/kokoro/db-full.sh"
timeout_mins: 4320
@ -19,7 +19,7 @@ env_vars {
env_vars {
key: "KOKORO_DIR"
value: "symbiflow-prjxray-continuous-db-artix7-full"
value: "symbiflow-prjxray-continuous-db-artix7"
}
env_vars {

View File

@ -1,32 +0,0 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "symbiflow-prjxray-continuous-db-kintex7-quick/.github/kokoro/db-quick.sh"
timeout_mins: 180
action {
define_artifacts {
regex: "**/*result*.xml"
regex: "**/*.log"
}
}
env_vars {
key: "KOKORO_TYPE"
value: "continuous"
}
env_vars {
key: "KOKORO_DIR"
value: "symbiflow-prjxray-continuous-db-kintex7-quick"
}
env_vars {
key: "XRAY_SETTINGS"
value: "kintex7"
}
env_vars {
key: "XRAY_BUILD_TYPE"
value: "quick"
}

View File

@ -1,6 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "symbiflow-prjxray-continuous-db-kintex7-full/.github/kokoro/db-full.sh"
build_file: "symbiflow-prjxray-continuous-db-kintex7/.github/kokoro/db-full.sh"
timeout_mins: 4320
@ -19,7 +19,7 @@ env_vars {
env_vars {
key: "KOKORO_DIR"
value: "symbiflow-prjxray-continuous-db-kintex7-full"
value: "symbiflow-prjxray-continuous-db-kintex7"
}
env_vars {

View File

@ -1,32 +0,0 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "symbiflow-prjxray-continuous-db-zynq7-quick/.github/kokoro/db-quick.sh"
timeout_mins: 180
action {
define_artifacts {
regex: "**/*result*.xml"
regex: "**/*.log"
}
}
env_vars {
key: "KOKORO_TYPE"
value: "continuous"
}
env_vars {
key: "KOKORO_DIR"
value: "symbiflow-prjxray-continuous-db-zynq7-quick"
}
env_vars {
key: "XRAY_SETTINGS"
value: "zynq7"
}
env_vars {
key: "XRAY_BUILD_TYPE"
value: "quick"
}

View File

@ -1,6 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "symbiflow-prjxray-continuous-db-zynq7-full/.github/kokoro/db-full.sh"
build_file: "symbiflow-prjxray-continuous-db-zynq7/.github/kokoro/db-full.sh"
timeout_mins: 4320
@ -19,7 +19,7 @@ env_vars {
env_vars {
key: "KOKORO_DIR"
value: "symbiflow-prjxray-continuous-db-zynq7-full"
value: "symbiflow-prjxray-continuous-db-zynq7"
}
env_vars {

View File

@ -1,44 +1,9 @@
#!/usr/bin/env python3
db_quick = """\
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "symbiflow-prjxray-%(kokoro_type)s-db-%(part)s%(ext)s/.github/kokoro/db-quick.sh"
timeout_mins: 180
action {
define_artifacts {
regex: "**/*result*.xml"
regex: "**/*.log"
}
}
env_vars {
key: "KOKORO_TYPE"
value: "%(kokoro_type)s"
}
env_vars {
key: "KOKORO_DIR"
value: "symbiflow-prjxray-%(kokoro_type)s-db-%(part)s%(ext)s"
}
env_vars {
key: "XRAY_SETTINGS"
value: "%(part)s"
}
env_vars {
key: "XRAY_BUILD_TYPE"
value: "quick"
}
"""
db_full = """\
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "symbiflow-prjxray-%(kokoro_type)s-db-%(part)s-full/.github/kokoro/db-full.sh"
build_file: "symbiflow-prjxray-%(kokoro_type)s-db-%(part)s/.github/kokoro/db-full.sh"
timeout_mins: 4320
@ -57,7 +22,7 @@ env_vars {
env_vars {
key: "KOKORO_DIR"
value: "symbiflow-prjxray-%(kokoro_type)s-db-%(part)s-full"
value: "symbiflow-prjxray-%(kokoro_type)s-db-%(part)s"
}
env_vars {
@ -72,20 +37,14 @@ env_vars {
"""
for part in ['artix7', 'kintex7', 'zynq7']:
with open("continuous-db-%s-quick.cfg" % part, "w") as f:
f.write(
db_quick % {
'part': part,
'kokoro_type': 'continuous',
'ext': '-quick'
})
with open("continuous-db-%s-full.cfg" % part, "w") as f:
f.write(db_full % {'part': part, 'kokoro_type': 'continuous'})
with open("continuous-db-%s.cfg" % part, "w") as f:
f.write(db_full % {
'part': part,
'kokoro_type': 'continuous',
})
with open("presubmit-db-%s.cfg" % part, "w") as f:
f.write(
db_quick % {
'part': part,
'kokoro_type': 'presubmit',
'ext': ''
})
f.write(db_full % {
'part': part,
'kokoro_type': 'presubmit',
})

View File

@ -1,13 +1,14 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "symbiflow-prjxray-presubmit-db-artix7/.github/kokoro/db-quick.sh"
build_file: "symbiflow-prjxray-presubmit-db-artix7/.github/kokoro/db-full.sh"
timeout_mins: 180
timeout_mins: 4320
action {
define_artifacts {
regex: "**/*result*.xml"
regex: "**/*.log"
regex: "database/artix7/**"
}
}
@ -28,5 +29,5 @@ env_vars {
env_vars {
key: "XRAY_BUILD_TYPE"
value: "quick"
value: "full"
}

View File

@ -1,13 +1,14 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "symbiflow-prjxray-presubmit-db-kintex7/.github/kokoro/db-quick.sh"
build_file: "symbiflow-prjxray-presubmit-db-kintex7/.github/kokoro/db-full.sh"
timeout_mins: 180
timeout_mins: 4320
action {
define_artifacts {
regex: "**/*result*.xml"
regex: "**/*.log"
regex: "database/kintex7/**"
}
}
@ -28,5 +29,5 @@ env_vars {
env_vars {
key: "XRAY_BUILD_TYPE"
value: "quick"
value: "full"
}

View File

@ -1,13 +1,14 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "symbiflow-prjxray-presubmit-db-zynq7/.github/kokoro/db-quick.sh"
build_file: "symbiflow-prjxray-presubmit-db-zynq7/.github/kokoro/db-full.sh"
timeout_mins: 180
timeout_mins: 4320
action {
define_artifacts {
regex: "**/*result*.xml"
regex: "**/*.log"
regex: "database/zynq7/**"
}
}
@ -28,5 +29,5 @@ env_vars {
env_vars {
key: "XRAY_BUILD_TYPE"
value: "quick"
value: "full"
}