diff options
author | Vratko Polak <vrpolak@cisco.com> | 2018-09-06 12:17:11 +0200 |
---|---|---|
committer | Vratko Polak <vrpolak@cisco.com> | 2018-09-06 12:17:11 +0200 |
commit | 124009e85acd84757b66bc49a3106adc138d224b (patch) | |
tree | d723afa95bce6dc6ab792d394d3b249851fb5081 /resources/libraries/bash/entry | |
parent | 02dde08c1b6f318d2a9ca8dbd1c6ecf679947a33 (diff) |
CSIT-1264: Add oper branch wrapper entry script
Change-Id: I569b089b711f89fecca8dd31d6906ef311982877
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources/libraries/bash/entry')
-rw-r--r-- | resources/libraries/bash/entry/per_patch_perf.sh | 4 | ||||
-rw-r--r-- | resources/libraries/bash/entry/with_oper_for_vpp.sh | 47 |
2 files changed, 50 insertions, 1 deletions
diff --git a/resources/libraries/bash/entry/per_patch_perf.sh b/resources/libraries/bash/entry/per_patch_perf.sh index 5f438a9abc..9fb266d106 100644 --- a/resources/libraries/bash/entry/per_patch_perf.sh +++ b/resources/libraries/bash/entry/per_patch_perf.sh @@ -15,6 +15,9 @@ set -exuo pipefail +# This entry script does not change CSIT branch, +# use "with_oper_for_vpp.sh" wrapper for that. +# # Assumptions: # + There is a directory holding VPP repo with patch under test checked out. # + It contains csit subdirectory with CSIT code to use (this script is there). @@ -25,7 +28,6 @@ set -exuo pipefail # + The following directories (relative to VPP repo) are (re)created: # ++ csit_new, csit_parent, build_new, build_parent, # ++ archive, csit/archive, csit_download_dir. -# This entry script currently does not need any environment variable set. # TODO: Implement some kind of VPP build caching. diff --git a/resources/libraries/bash/entry/with_oper_for_vpp.sh b/resources/libraries/bash/entry/with_oper_for_vpp.sh new file mode 100644 index 0000000000..23c0d8a9d1 --- /dev/null +++ b/resources/libraries/bash/entry/with_oper_for_vpp.sh @@ -0,0 +1,47 @@ +#!/usr/bin/env bash + +# Copyright (c) 2018 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -exuo pipefail + +# Typical usage: +# $ source "./with_oper_for_vpp.sh" "per_patch_perf.sh" +# +# This wrapper is mostly useful for Jenkins invocation, +# because in manual testing people usually already have checked out +# the branches they want to test (which might not yet be available in Gerrit). +# +# Assumptions: +# + There is a directory holding initial CSIT code to use, this script is there. +# + First argument is filename of next entry script to execute. +# TODO: Support relative paths? Relative to BASH_ENTRY_DIR? +# Consequences: +# + A csit branch name is computed. +# + Possibly overriden, based on CSIT_REF value. +# + The computed or overriden CSIT refspec is checked out. +# + The argument entry script is sourced, with arguments shifted. + +# "set -eu" handles failures from the following two lines. +BASH_ENTRY_DIR="$(dirname $(readlink -e "${BASH_SOURCE[0]}"))" +BASH_FUNCTION_DIR="$(readlink -e "${BASH_ENTRY_DIR}/../function")" +source "${BASH_FUNCTION_DIR}/common.sh" || { + echo "Source failed." >&2 + exit 1 +} +common_dirs || die +source "${BASH_FUNCTION_DIR}/branch.sh" || die "Source failed." +checkout_csit_for_vpp "${GERRIT_BRANCH}" || die +cmd="${1}" +shift +source "${BASH_ENTRY_DIR}/${cmd}" "$@" |