Skip to content

Commit 9817643

Browse files
cf-buildpacks-engryanmoran
authored andcommitted
Updating github-config
1 parent ee696ba commit 9817643

File tree

1 file changed

+6
-44
lines changed

1 file changed

+6
-44
lines changed

scripts/integration.sh

Lines changed: 6 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,15 @@ readonly ROOTDIR
1111
source "${ROOTDIR}/scripts/.util/tools.sh"
1212

1313
function main() {
14-
local src stack harness
14+
local src stack
1515
src="$(find "${ROOTDIR}/src" -mindepth 1 -maxdepth 1 -type d )"
1616
stack="${CF_STACK:-$(jq -r -S .stack "${ROOTDIR}/config.json")}"
17-
harness="$(jq -r -S .integration.harness "${ROOTDIR}/config.json")"
1817

1918
IFS=$'\n' read -r -d '' -a matrix < <(
2019
jq -r -S -c .integration.matrix[] "${ROOTDIR}/config.json" \
2120
&& printf "\0"
2221
)
2322

24-
util::tools::ginkgo::install --directory "${ROOTDIR}/.bin"
2523
util::tools::buildpack-packager::install --directory "${ROOTDIR}/.bin"
2624
util::tools::cf::install --directory "${ROOTDIR}/.bin"
2725

@@ -32,16 +30,15 @@ function main() {
3230

3331
echo "Running integration suite (cached: ${cached}, parallel: ${parallel})"
3432

35-
specs::run "${harness}" "${cached}" "${parallel}" "${stack}"
33+
specs::run "${cached}" "${parallel}" "${stack}"
3634
done
3735
}
3836

3937
function specs::run() {
40-
local harness cached parallel stack
41-
harness="${1}"
42-
cached="${2}"
43-
parallel="${3}"
44-
stack="${4}"
38+
local cached parallel stack
39+
cached="${1}"
40+
parallel="${2}"
41+
stack="${3}"
4542

4643
local nodes cached_flag serial_flag
4744
cached_flag="--cached=${cached}"
@@ -56,21 +53,6 @@ function specs::run() {
5653
local buildpack_file
5754
buildpack_file="$(buildpack::package "1.2.3" "${cached}" "${stack}")"
5855

59-
if [[ "${harness}" == "gotest" ]]; then
60-
specs::gotest::run "${nodes}" "${cached_flag}" "${serial_flag}" "${buildpack_file}" "${stack}"
61-
else
62-
specs::ginkgo::run "${nodes}" "${cached_flag}" "${serial_flag}" "${buildpack_file}" "${stack}"
63-
fi
64-
}
65-
66-
function specs::gotest::run() {
67-
local nodes cached_flag serial_flag buildpack_file stack
68-
nodes="${1}"
69-
cached_flag="${2}"
70-
serial_flag="${3}"
71-
buildpack_file="${4}"
72-
stack="${5}"
73-
7456
CF_STACK="${stack}" \
7557
BUILDPACK_FILE="${BUILDPACK_FILE:-"${buildpack_file}"}" \
7658
GOMAXPROCS="${GOMAXPROCS:-"${nodes}"}" \
@@ -84,26 +66,6 @@ function specs::gotest::run() {
8466
"${serial_flag}"
8567
}
8668

87-
function specs::ginkgo::run(){
88-
local nodes cached_flag serial_flag buildpack_file stack
89-
nodes="${1}"
90-
cached_flag="${2}"
91-
serial_flag="${3}"
92-
buildpack_file="${4}"
93-
stack="${5}"
94-
95-
CF_STACK="${stack}" \
96-
BUILDPACK_FILE="${BUILDPACK_FILE:-"${buildpack_file}"}" \
97-
ginkgo \
98-
-r \
99-
-mod vendor \
100-
--flakeAttempts "${GINKGO_ATTEMPTS:-2}" \
101-
-nodes "${nodes}" \
102-
--slowSpecThreshold 60 \
103-
"${src}/integration" \
104-
-- "${cached_flag}" "${serial_flag}"
105-
}
106-
10769
function buildpack::package() {
10870
local version cached stack
10971
version="${1}"

0 commit comments

Comments
 (0)