You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ab...@apache.org on 2017/12/01 17:23:56 UTC

[geode] branch develop updated: [GEODE-4023] Minor fixes for typos and complex gradle test types.

This is an automated email from the ASF dual-hosted git repository.

abaker pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 586f945  [GEODE-4023] Minor fixes for typos and complex gradle test types.
586f945 is described below

commit 586f9456a2587d8e9118f482850138c4750c85c3
Author: Sean Goller <sg...@pivotal.io>
AuthorDate: Fri Dec 1 08:33:23 2017 -0800

    [GEODE-4023] Minor fixes for typos and complex gradle test types.
    
    * Fix typo in DistributedTest archive step
    * Sanitize gradle task variable to take the last component of the task
      and use it for the directory to store test results.
    * Fix not adding geode input to DistributedTest's archive step so that
      the version can be properly calculated.
    * Remove debugging flag.
---
 ci/pipelines/develop.yml   | 3 ++-
 ci/scripts/test-archive.sh | 3 ++-
 ci/scripts/test-run.sh     | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ci/pipelines/develop.yml b/ci/pipelines/develop.yml
index 9b6ae54..1cb36c6 100644
--- a/ci/pipelines/develop.yml
+++ b/ci/pipelines/develop.yml
@@ -168,6 +168,7 @@ jobs:
          - task: archive-results
            config:
              inputs:
+               - name: geode
                - name: geode-ci
                - name: geode-build-version
                - name: built-geode
@@ -179,7 +180,7 @@ jobs:
                PUBLIC_BUCKET: ((!public-bucket))
              run:
                args:
-               - distrbutedTest
+               - distributedTest
                - distributedtestfiles
                path: geode-ci/ci/scripts/test-archive.sh
 
diff --git a/ci/scripts/test-archive.sh b/ci/scripts/test-archive.sh
index 3099524..fa92eff 100755
--- a/ci/scripts/test-archive.sh
+++ b/ci/scripts/test-archive.sh
@@ -22,6 +22,7 @@ export TERM=${TERM:-dumb}
 export BUILDROOT=$(pwd)
 export DEST_DIR=${BUILDROOT}/built-geode
 export GRADLE_TASK=${1}
+export SANITIZED_GRADLE_TASK=${GRADLE_TASK##*:}
 export BASE_FILENAME=${2}
 export TMPDIR=${DEST_DIR}/tmp
 export GEODE_BUILD=${DEST_DIR}/test
@@ -91,7 +92,7 @@ pushd ${GEODE_BUILD}
 popd
 
 ARTIFACTS_DESTINATION="${PUBLIC_BUCKET}/builds/${FULL_PRODUCT_VERSION}"
-TEST_RESULTS_DESTINATION="${ARTIFACTS_DESTINATION}/test-results/${GRADLE_TASK}/"
+TEST_RESULTS_DESTINATION="${ARTIFACTS_DESTINATION}/test-results/${SANITIZED_GRADLE_TASK}/"
 TEST_ARTIFACTS_DESTINATION="${ARTIFACTS_DESTINATION}/test-artifacts/"
 FULL_BUILD_ARCHIVE_DESTINATION="${ARTIFACTS_DESTINATION}/geodefiles-${FULL_PRODUCT_VERSION}.tgz"
 BUILD_ARTIFACTS_FILENAME=geode-build-artifacts-${FULL_PRODUCT_VERSION}.tgz
diff --git a/ci/scripts/test-run.sh b/ci/scripts/test-run.sh
index bb22b82..21721ae 100755
--- a/ci/scripts/test-run.sh
+++ b/ci/scripts/test-run.sh
@@ -16,7 +16,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -x
 set -e
 
 export TERM=${TERM:-dumb}

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].