You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2018/08/24 15:09:49 UTC
[geode] branch windows-heavy-lifter updated (1f9ff3b -> b45f425)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a change to branch windows-heavy-lifter
in repository https://gitbox.apache.org/repos/asf/geode.git.
discard 1f9ff3b Revert to using the external IP
discard 38dbb09 generate key
discard e7b63a2 Correct regex for windows job detection
discard 7d7e83e Debug output
discard 8ffda62 initial commit for windows heavy lifting
add 04ecdbb GEODE-5505 Cache listener not invoked on a retried destroy() operation
add 5602d02 GEODE-5615: Capturing more data in the case of hangs or OOMEs
add a77905d GEODE-5600: Add build property skipVersionFileRegeneration
add 0e792a5 suggested feedback: pass revision as build parameter, only create version file when present (or file does not exist). Remove input based on .git/index.
add b02d3f7 0 -> unknown, specify sourceRepository also, auto-format adjusts whitespace.
add c404191 Some stuff
add be57a3b Merge remote-tracking branch 'origin/develop' into geode-5602
add 793335e wip
add 3598afd Add SOURCE_REPOSITORY to Jinja template for script calls, and git rev-parse for revision info.
add 926a0d6 Correct whitespace issue in jinja template
add 2fadf46 Correct directory for git command.
add b5e80b5 Merge remote-tracking branch 'origin/develop' into geode-5600
add 98a0b7d Merge pull request #2349 from smgoller/geode-5600
add 114be74 GEODE-5547: cleanup RegionManagementDUnitTest
add 6c2bc15 GEODE-5547: increase Await timeout
add c435bc7 GEODE-5615: Removing gradle build scan plugin
add 14a6a05 GEODE-3530: Deleting CliCommandTestBase
add b6ba0fa GEODE-5613: Add winrm-cli for Windows CI support (#2364)
add 966852d GEODE-5619: Change scanning for XSDRootElement to consider all packag… (#2361)
add 9f13a5b GEODE-5610: CI Failure: DiskRegionJUnitTest testAssertionErrorIfMissingOplog (#2357)
add c7ca13d GEODE-5460: Fixing a race condition in TestFunctionsDUNitTest
add 6ee86d6 GEODE-5597 verify geode-dependency jar ClassPath (#2369)
add 879b2cd GEODE-5597: Fixes formatting.
add a1f747c GEODE-5440: when we need re-evaluate a entry in a index, we need to pass in the outer value key in the equiJoin. (#2338)
add abb2702 GEODE-5630: fix use of Awaitility in BucketCreationCrashCompletesRegressionTest
add 9be422c GEODE-5617: FIxing a race in AutoBalancerJUnitTest
add cfa7ca5 GEODE-5627: ConcurrencyRule passes when not used. (#2370)
add 39b2236 GEODE-5597 let AssemblyContentsIntegrationTest pass on windows
new 97a7795 initial commit for windows heavy lifting
new 1fe319a Debug output
new 757b988 Correct regex for windows job detection
new 341430b generate key
new 79fee3b Revert to using the external IP
new b45f425 Use the public key
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1f9ff3b)
\
N -- N -- N refs/heads/windows-heavy-lifter (b45f425)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.gradle | 2 -
ci/docker/Dockerfile | 4 -
ci/images/alpine-tools/Dockerfile | 11 +-
ci/pipelines/geode-build/jinja.template.yml | 3 +
ci/pipelines/shared/shared_jinja.yml | 2 +-
ci/scripts/archive_results.sh | 1 +
ci/scripts/build.sh | 3 +-
ci/scripts/capture-call-stacks.sh | 4 +-
ci/scripts/execute_tests.sh | 4 +-
ci/scripts/rsync_code_down.sh | 2 +-
ci/scripts/start_instance.sh | 2 +-
ci/scripts/windows/test-run.sh | 2 +
.../geode/AssemblyContentsIntegrationTest.java | 4 +-
...java => GeodeDependencyJarIntegrationTest.java} | 69 +-
.../resources/dependency_classpath.txt | 67 +
geode-core/build.gradle | 77 +-
.../partitioned/PRColocatedEquiJoinDUnitTest.java | 47 -
.../query/partitioned/PRQueryDUnitHelper.java | 86 +-
...BucketCreationCrashCompletesRegressionTest.java | 4 +-
.../geode/management/ManagementTestRule.java | 83 +-
.../management/RegionManagementDUnitTest.java | 1336 ++++++++++----------
.../internal/pulse/TestFunctionsDUnitTest.java | 96 +-
.../query/internal/IndexManagerJUnitTest.java | 12 +-
.../query/partitioned/PRColocatedEquiJoinTest.java | 110 ++
.../geode/internal/cache/DiskRegionJUnitTest.java | 94 +-
.../query/internal/IndexTrackingQueryObserver.java | 1 +
.../geode/cache/query/internal/QueryUtils.java | 10 +-
.../cache/query/internal/index/IndexManager.java | 30 +-
.../cache/query/internal/index/RangeIndex.java | 7 +-
.../distributed/internal/DistributionAdvisor.java | 11 +-
.../InternalConfigurationPersistenceService.java | 2 +-
.../internal/cli/util/ClasspathScanLoadHelper.java | 17 +-
...nternalConfigurationPersistenceServiceTest.java | 2 +-
.../internal/cache/functions/TestFunction.java | 286 ++---
.../internal/cli/commands/CliCommandTestBase.java | 554 --------
.../main/java/org/apache/geode/test/dunit/VM.java | 7 +
.../geode/test/dunit/rules/ClusterStartupRule.java | 8 +
.../geode/test/junit/rules/ServerStarterRule.java | 21 +
.../geode/test/junit/rules/ConcurrencyRule.java | 8 +-
.../test/junit/rules/ConcurrencyRuleTest.java | 7 +
.../geode/cache/util/AutoBalancerJUnitTest.java | 6 +-
gradle.properties | 8 +-
42 files changed, 1319 insertions(+), 1791 deletions(-)
copy geode-assembly/src/integrationTest/java/org/apache/geode/{AssemblyContentsIntegrationTest.java => GeodeDependencyJarIntegrationTest.java} (50%)
create mode 100644 geode-assembly/src/integrationTest/resources/dependency_classpath.txt
create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinTest.java
delete mode 100644 geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
[geode] 04/06: generate key
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch windows-heavy-lifter
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 341430b10f2dceed1693e731c08be55a18722ebb
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Wed Aug 22 15:51:57 2018 -0700
generate key
---
ci/scripts/start_instance.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ci/scripts/start_instance.sh b/ci/scripts/start_instance.sh
index da94c97..d35afa2 100755
--- a/ci/scripts/start_instance.sh
+++ b/ci/scripts/start_instance.sh
@@ -117,6 +117,8 @@ else
sleep 5
done
+ ssh-keygen -N "" -f ${SSHKEY_FILE}
+
KEY=$( cat ${SSHKEY_FILE} )
winrm -hostname ${INSTANCE_IP_ADDRESS} -username geode -password "${PASSWORD}" \
[geode] 06/06: Use the public key
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch windows-heavy-lifter
in repository https://gitbox.apache.org/repos/asf/geode.git
commit b45f425e9d1e845c450c19c833ec6439932b5d51
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Fri Aug 24 08:06:31 2018 -0700
Use the public key
---
ci/scripts/start_instance.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ci/scripts/start_instance.sh b/ci/scripts/start_instance.sh
index 00dc004..6397ad7 100755
--- a/ci/scripts/start_instance.sh
+++ b/ci/scripts/start_instance.sh
@@ -119,7 +119,7 @@ else
ssh-keygen -N "" -f ${SSHKEY_FILE}
- KEY=$( cat ${SSHKEY_FILE} )
+ KEY=$( cat ${SSHKEY_FILE}.pub )
winrm -hostname ${INSTANCE_IP_ADDRESS} -username geode -password "${PASSWORD}" \
-https -insecure -port 5986 \
[geode] 01/06: initial commit for windows heavy lifting
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch windows-heavy-lifter
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 97a7795da3edf4cfb2460582b63c85332fb0a929
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Wed Aug 22 11:58:01 2018 -0700
initial commit for windows heavy lifting
---
ci/pipelines/geode-build/jinja.template.yml | 71 +++--------------------------
ci/pipelines/shared/jinja.variables.yml | 53 ++++++++++-----------
ci/scripts/execute_tests.sh | 2 +-
ci/scripts/start_instance.sh | 29 ++++++++++--
4 files changed, 56 insertions(+), 99 deletions(-)
diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index 39acf0a..7762377 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -31,7 +31,12 @@
{% endmacro %}
{% macro common_test_params(test) %}
+ {%- if test.CALL_STACK_TIMEOUT -%}
CALL_STACK_TIMEOUT: {{test.CALL_STACK_TIMEOUT}}
+ {%- endif -%}
+ {%- if test.GRADLE_TASK_OPTIONS -%}
+GRADLE_TASK_OPTIONS: {{test.GRADLE_TASK_OPTIONS}}
+ {%- endif -%}
DUNIT_PARALLEL_FORKS: {{test.DUNIT_PARALLEL_FORKS}}
MAINTENANCE_VERSION: {{repository.branch}}
PARALLEL_DUNIT: {{test.PARALLEL_DUNIT}}
@@ -43,7 +48,7 @@ groups:
- name: main
jobs:
- Build
- {% for test in (tests + windowstests) if not test.name=="StressNew" -%}
+ {% for test in tests if not test.name=="StressNew" -%}
- {{test.name}}Test
{% endfor -%}
- UpdatePassingRef
@@ -283,67 +288,3 @@ jobs:
- name: instance-data
timeout: 1h
{% endfor -%}
-{% for test in windowstests %}
-- name: {{test.name}}Test
- public: true
- serial: true
- plan:
- {{ plan_resource_gets() |indent(2) }}
- - task: cleanup-java-processes
- config:
- platform: windows
- run:
- path: powershell
- args:
- - -command
- - |
- gwmi win32_process -filter 'name = "java.exe"' | select commandline | format-list
- kill -name java -force
- exit 0
- tags:
- - windows-{{test.tags}}-tests
- - task: execute_tests
- config:
- platform: windows
- params:
- JAVA_HOME: C:\progra~1\java\jdk1.8.0_181
- SOURCE_REPOSITORY: {{repository.branch}}
- {{ common_test_params(test) | indent(8) }}
- run:
- path: bash
- args:
- - geode-ci/ci/scripts/windows/test-run.sh
- - {{test.target_arg}}
- - {{test.dir_arg}}
- - {{test.package_arg}}
- inputs:
- - name: geode-ci
- - name: geode
- outputs:
- - name: built-geode
- tags:
- - windows-{{test.tags}}-tests
- ensure:
- aggregate:
- - task: archive_results
- config:
- platform: windows
- params:
- MAINTENANCE_VERSION: {{repository.branch}}
- PUBLIC_BUCKET: ((!public-bucket))
- SERVICE_ACCOUNT: ((!concourse-gcp-account))
- run:
- path: bash
- args:
- - geode-ci/ci/scripts/windows/test-archive.sh
- - {{test.target_arg}}
- - {{test.dir_arg}}
- inputs:
- - name: geode-ci
- - name: geode-build-version
- - name: built-geode
- tags:
- - windows-{{test.tags}}-tests
- timeout: 1h
- timeout: 6h
-{% endfor %}
diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml
index fd4789e..d0a28f4 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -18,12 +18,6 @@
repository:
project: geode
-platforms:
-- name: "Linux"
- prefix: ""
-- name: "Windows"
- prefix: "Windows"
-
tests:
- name: "Acceptance"
CPUS: "8"
@@ -70,37 +64,40 @@ tests:
GRADLE_TASK: repeatTest
execute_test_timeout: 2h15m
PARALLEL_DUNIT: "true"
-
-windowstests:
- name: "WindowsAcceptance"
- tags: "acceptance"
- CALL_STACK_TIMEOUT: "1800"
+ tags: "windows"
+ CPUS: "16"
+ RAM: "32"
+ ARTIFACT_SLUG: windows-acceptancetestfiles
DUNIT_PARALLEL_FORKS: "0"
+ GRADLE_TASK: :geode-assembly:acceptanceTest
+ execute_test_timeout: 6h
PARALLEL_DUNIT: "false"
- target_arg: :geode-assembly:acceptanceTest
- dir_arg: windows-acceptancetestfiles
- package_arg: ""
- name: "WindowsGfshDistributed"
- tags: "distributed"
- CALL_STACK_TIMEOUT: "1800"
+ tags: "windows"
+ CPUS: "16"
+ RAM: "32"
+ ARTIFACT_SLUG: windows-gfshdistributedtest
DUNIT_PARALLEL_FORKS: "0"
+ GRADLE_TASK: distributedTest
+ GRADLE_TASK_OPTIONS: "-PtestCategory=org.apache.geode.test.junit.categories.GfshTest"
+ execute_test_timeout: 6h
PARALLEL_DUNIT: "false"
- target_arg: distributedTest
- dir_arg: windows-gfshdistributedtest
- package_arg: org.apache.geode.test.junit.categories.GfshTest
- name: "WindowsIntegration"
- tags: "integration"
- CALL_STACK_TIMEOUT: "1800"
+ tags: "windows"
+ CPUS: "16"
+ RAM: "32"
+ ARTIFACT_SLUG: windows-integrationtestfiles
DUNIT_PARALLEL_FORKS: "0"
+ GRADLE_TASK: integrationTest
+ execute_test_timeout: 6h
PARALLEL_DUNIT: "false"
- target_arg: integrationTest
- dir_arg: windows-integrationtestfiles
- package_arg: ""
- name: "WindowsUnit"
- tags: "unit"
- CALL_STACK_TIMEOUT: "1800"
+ tags: "windows"
+ CPUS: "16"
+ RAM: "32"
+ ARTIFACT_SLUG: windows-unittestfiles
DUNIT_PARALLEL_FORKS: "0"
+ GRADLE_TASK: test
+ execute_test_timeout: 6h
PARALLEL_DUNIT: "false"
- target_arg: test
- dir_arg: windows-unittestfiles
- package_arg: ""
diff --git a/ci/scripts/execute_tests.sh b/ci/scripts/execute_tests.sh
index e270994..00db410 100755
--- a/ci/scripts/execute_tests.sh
+++ b/ci/scripts/execute_tests.sh
@@ -79,4 +79,4 @@ GRADLE_COMMAND="./gradlew \
${SCM_PROPS}"
echo "${GRADLE_COMMAND}"
-ssh -i ${SSHKEY_FILE} geode@${INSTANCE_IP_ADDRESS} "mkdir -p tmp && cd geode && ${GRADLE_COMMAND}"
+ssh -i ${SSHKEY_FILE} geode@${INSTANCE_IP_ADDRESS} "bash -c 'mkdir -p tmp; cd geode; ${GRADLE_COMMAND}'"
diff --git a/ci/scripts/start_instance.sh b/ci/scripts/start_instance.sh
index c9a54f2..aa85924 100755
--- a/ci/scripts/start_instance.sh
+++ b/ci/scripts/start_instance.sh
@@ -50,11 +50,16 @@ SANITIZED_BUILD_PIPELINE_NAME=$(echo ${BUILD_PIPELINE_NAME} | tr "/" "-" | tr '[
SANITIZED_BUILD_JOB_NAME=$(echo ${BUILD_JOB_NAME} | tr "/" "-" | tr '[:upper:]' '[:lower:]')
SANITIZED_BUILD_NAME=$(echo ${BUILD_NAME} | tr "/" "-" | tr '[:upper:]' '[:lower:]')
IMAGE_FAMILY_PREFIX=""
+WINDOWS_PREFIX=""
if [[ "${GEODE_FORK}" != "apache" ]]; then
IMAGE_FAMILY_PREFIX="${GEODE_FORK}-${SANITIZED_GEODE_BRANCH}-"
fi
+if [[ "${SANITIZED_BUILD_JOB_NAME}" =~ Windows ]]; then
+ WINDOWS_PREFIX="windows-"
+fi
+
INSTANCE_NAME="$(echo "build-${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-${BUILD_NAME}" | tr '[:upper:]' '[:lower:]')"
PROJECT=apachegeode-ci
ZONE=us-central1-f
@@ -76,7 +81,7 @@ while true; do
--min-cpu-platform=Intel\ Skylake \
--network="heavy-lifters" \
--subnet="heavy-lifters" \
- --image-family="${IMAGE_FAMILY_PREFIX}geode-builder" \
+ --image-family="${IMAGE_FAMILY_PREFIX}${WINDOWS_PREFIX}geode-builder" \
--image-project=${PROJECT} \
--boot-disk-size=100GB \
--boot-disk-type=pd-ssd \
@@ -96,9 +101,23 @@ done
echo "${INSTANCE_INFORMATION}" > instance-data/instance-information
-INSTANCE_IP_ADDRESS=$(echo ${INSTANCE_INFORMATION} | jq -r '.[].networkInterfaces[0].accessConfigs[0].natIP')
+# This extracts the internal IP address for subsequent use
+INSTANCE_IP_ADDRESS=$(echo ${INSTANCE_INFORMATION} | jq -r '.[].networkInterfaces[0].networkIP')
echo "${INSTANCE_IP_ADDRESS}" > "instance-data/instance-ip-address"
-while ! gcloud compute --project=${PROJECT} ssh geode@${INSTANCE_NAME} --zone=${ZONE} --ssh-key-file=${SSHKEY_FILE} --quiet -- true; do
- echo -n .
-done
+if [[ -z "${WINDOWS_PREFIX}" ]]; then
+ while ! gcloud compute --project=${PROJECT} ssh geode@${INSTANCE_NAME} --zone=${ZONE} --ssh-key-file=${SSHKEY_FILE} --quiet -- true; do
+ echo -n .
+ done
+else
+ # Set up ssh access for Windows systems
+ while [[ -z "${PASSWORD}" ]]; do
+ PASSWORD=$( yes | gcloud beta compute reset-windows-password ${INSTANCE_NAME} --user=geode --zone=${ZONE} --format json | jq -r .password )
+ sleep 5
+ done
+
+ KEY=$( cat ${SSHKEY_FILE} )
+
+ winrm -hostname ${INSTANCE_IP_ADDRESS} -username geode -password "${PASSWORD}" \
+ "powershell -command \"&{ mkdir c:\users\geode\.ssh -force; set-content -path c:\users\geode\.ssh\authorized_keys -encoding utf8 -value '${KEY}' }\""
+fi
[geode] 02/06: Debug output
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch windows-heavy-lifter
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 1fe319a7ffffb05d05a22dfe504c6671627dceaa
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Wed Aug 22 12:52:39 2018 -0700
Debug output
---
ci/pipelines/geode-build/jinja.template.yml | 8 ++++----
ci/scripts/start_instance.sh | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index 7762377..13d9e10 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -31,12 +31,12 @@
{% endmacro %}
{% macro common_test_params(test) %}
- {%- if test.CALL_STACK_TIMEOUT -%}
+ {% if test.CALL_STACK_TIMEOUT %}
CALL_STACK_TIMEOUT: {{test.CALL_STACK_TIMEOUT}}
- {%- endif -%}
- {%- if test.GRADLE_TASK_OPTIONS -%}
+ {% endif %}
+ {% if test.GRADLE_TASK_OPTIONS %}
GRADLE_TASK_OPTIONS: {{test.GRADLE_TASK_OPTIONS}}
- {%- endif -%}
+ {% endif %}
DUNIT_PARALLEL_FORKS: {{test.DUNIT_PARALLEL_FORKS}}
MAINTENANCE_VERSION: {{repository.branch}}
PARALLEL_DUNIT: {{test.PARALLEL_DUNIT}}
diff --git a/ci/scripts/start_instance.sh b/ci/scripts/start_instance.sh
index aa85924..69ba070 100755
--- a/ci/scripts/start_instance.sh
+++ b/ci/scripts/start_instance.sh
@@ -18,6 +18,7 @@
# limitations under the License.
set -e
+set -x
BASE_DIR=$(pwd)
[geode] 05/06: Revert to using the external IP
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch windows-heavy-lifter
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 79fee3b5acbdfc3af666bf584c8716fe93ea8b22
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Thu Aug 23 16:18:35 2018 -0700
Revert to using the external IP
---
ci/scripts/start_instance.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ci/scripts/start_instance.sh b/ci/scripts/start_instance.sh
index d35afa2..00dc004 100755
--- a/ci/scripts/start_instance.sh
+++ b/ci/scripts/start_instance.sh
@@ -103,7 +103,7 @@ done
echo "${INSTANCE_INFORMATION}" > instance-data/instance-information
# This extracts the internal IP address for subsequent use
-INSTANCE_IP_ADDRESS=$(echo ${INSTANCE_INFORMATION} | jq -r '.[].networkInterfaces[0].networkIP')
+INSTANCE_IP_ADDRESS=$(echo ${INSTANCE_INFORMATION} | jq -r '.[].networkInterfaces[0].accessConfigs[0].natIP')
echo "${INSTANCE_IP_ADDRESS}" > "instance-data/instance-ip-address"
if [[ -z "${WINDOWS_PREFIX}" ]]; then
@@ -122,5 +122,6 @@ else
KEY=$( cat ${SSHKEY_FILE} )
winrm -hostname ${INSTANCE_IP_ADDRESS} -username geode -password "${PASSWORD}" \
+ -https -insecure -port 5986 \
"powershell -command \"&{ mkdir c:\users\geode\.ssh -force; set-content -path c:\users\geode\.ssh\authorized_keys -encoding utf8 -value '${KEY}' }\""
fi
[geode] 03/06: Correct regex for windows job detection
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch windows-heavy-lifter
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 757b9889a4a267857147a9b138a03ee283427bc5
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Wed Aug 22 13:01:00 2018 -0700
Correct regex for windows job detection
---
ci/scripts/start_instance.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ci/scripts/start_instance.sh b/ci/scripts/start_instance.sh
index 69ba070..da94c97 100755
--- a/ci/scripts/start_instance.sh
+++ b/ci/scripts/start_instance.sh
@@ -57,7 +57,7 @@ if [[ "${GEODE_FORK}" != "apache" ]]; then
IMAGE_FAMILY_PREFIX="${GEODE_FORK}-${SANITIZED_GEODE_BRANCH}-"
fi
-if [[ "${SANITIZED_BUILD_JOB_NAME}" =~ Windows ]]; then
+if [[ "${SANITIZED_BUILD_JOB_NAME}" =~ [Ww]indows ]]; then
WINDOWS_PREFIX="windows-"
fi