aboutsummaryrefslogtreecommitdiffstats
path: root/ice-testengine
diff options
context:
space:
mode:
authorstark, steven <ss820f@att.com>2018-06-13 17:19:07 -0700
committerstark, steven <ss820f@att.com>2018-06-13 17:19:07 -0700
commitf9e35bc64058dcfc18fd07cd72aeba253a48d2cd (patch)
tree7cd982d68253ac7b62a2abb11d13d032f769c1eb /ice-testengine
parent1c0934b2dafdc753c96b7a480d8e0f8b0b6ed244 (diff)
[VVP] change validation scripts reference
Change-Id: I6c8a698e787f970a1094a538c955b36509620f56 Issue-ID: VVP-77 Signed-off-by: stark, steven <ss820f@att.com>
Diffstat (limited to 'ice-testengine')
-rwxr-xr-xice-testengine56
1 files changed, 27 insertions, 29 deletions
diff --git a/ice-testengine b/ice-testengine
index 6f7f2c0..525a0f8 100755
--- a/ice-testengine
+++ b/ice-testengine
@@ -45,37 +45,35 @@
exit 1
}
-clone_or_update(){
- # Given a repo, if we have a local clone already, update it. Otherwise,
- # perform a shallow clone.
- repo_name="$1"
- repo_url="$2"
- branch="${3:-master}"
- if [ -d "$WORKSPACE/$repo_name" ]; then
- git -C "$WORKSPACE/$repo_name" fetch --depth 1 --force origin "$branch"
- git -C "$WORKSPACE/$repo_name" reset --hard origin/"$branch"
- git -C "$WORKSPACE/$repo_name" gc
- else
- git clone --branch "$branch" --depth 1 --single-branch --recursive "$repo_url" "$WORKSPACE/$repo_name"
- fi
+clone_or_update(){
+ # Given a repo, if we have a local clone already, update it. Otherwise,
+ # perform a shallow clone.
+ repo_name="$1"
+ repo_url="$2"
+ branch="${3:-master}"
+ if [ -d "$WORKSPACE/$repo_name" ]; then
+ git -C "$WORKSPACE/$repo_name" fetch --depth 1 --force origin "$branch"
+ git -C "$WORKSPACE/$repo_name" reset --hard origin/"$branch"
+ git -C "$WORKSPACE/$repo_name" gc
+ else
+ git clone --branch "$branch" --depth 1 --single-branch --recursive "$repo_url" "$WORKSPACE/$repo_name"
+ fi
}
+domain=`echo $git_repo_url | cut -d @ -f2 | cut -d ":" -f1`
+repo=`echo $git_repo_url | cut -d @ -f2 | cut -d ":" -f2`
# Clone or update the repo containing the VF to be evaluated
-clone_or_update "VF" "$git_repo_url" master
-
-# Clone or update the TestEngine Validation Suite repos
-for repo in "ice-validationmgr" "ice-heat-validation"
-do
- clone_or_update "$repo" "git@github.com:att-innovate/$repo.git" develop
-done
-
-# Run test suite(s)
-cd "$WORKSPACE/ice-validationmgr"
-pytest --tap-stream
-cd "$WORKSPACE/ice-heat-validation/ice_validator"
-pytest --tap-stream --template-dir="$WORKSPACE/VF"
-
+clone_or_update "VF" "http://$domain/$repo" master
+
+# Clone or update the TestEngine Validation Suite repos
+clone_or_update "validation-scripts" "https://gerrit.onap.org/r/vvp/validation-scripts" master
+
+# Run test suite(s)
+cd "$WORKSPACE/validation-scripts/ice_validator"
+pytest --tap-stream --template-dir="$WORKSPACE/VF"
+
# Clean up; remove VF directory. (VF may bring along files >20G. Easier to
# waste bandwidth than deal with full disk. After we move to 31T root disk for
-# workspace, we can perform this cleanup less aggressively.
-rm -rf "${WORKSPACE}/VF"
+# workspace, we can perform this cleanup less aggressively.
+rm -rf "${WORKSPACE}/VF"
+