Skip to content

Commit

Permalink
[GEODE-4023] Minor fixes for typos and complex gradle test types.
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
smgoller authored and metatype committed Dec 1, 2017
1 parent b2d37ec commit 586f945
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion ci/pipelines/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ jobs:
- task: archive-results
config:
inputs:
- name: geode
- name: geode-ci
- name: geode-build-version
- name: built-geode
Expand All @@ -179,7 +180,7 @@ jobs:
PUBLIC_BUCKET: ((!public-bucket))
run:
args:
- distrbutedTest
- distributedTest
- distributedtestfiles
path: geode-ci/ci/scripts/test-archive.sh

Expand Down
3 changes: 2 additions & 1 deletion ci/scripts/test-archive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ci/scripts/test-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit 586f945

Please sign in to comment.