Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bash: Process job-specs without cores and drivers
[csit.git]
/
resources
/
libraries
/
bash
/
function
/
branch.sh
diff --git
a/resources/libraries/bash/function/branch.sh
b/resources/libraries/bash/function/branch.sh
index
558a2b6
..
ba9cc39
100644
(file)
--- a/
resources/libraries/bash/function/branch.sh
+++ b/
resources/libraries/bash/function/branch.sh
@@
-1,4
+1,4
@@
-# Copyright (c) 20
18
Cisco and/or its affiliates.
+# Copyright (c) 20
21
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:
# 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:
@@
-28,6
+28,11
@@
function checkout_csit_for_vpp () {
# When the refspec is overriden, the computation is still performed,
# in order to show (on Sandbox) the computation is correct.
#
# When the refspec is overriden, the computation is still performed,
# in order to show (on Sandbox) the computation is correct.
#
+ # Git status and git log -1 are executed, so the current state
+ # of the checked-out branch is visible.
+ # This is mainly useful for identifying trending anomalies
+ # caused by changes in CSIT code.
+ #
# On failure, working directory could remain changed to ${CSIT_DIR}.
# TODO: It could be possible to use ERR trap to force popd,
# but with "set -x" the noise is not worth it,
# On failure, working directory could remain changed to ${CSIT_DIR}.
# TODO: It could be possible to use ERR trap to force popd,
# but with "set -x" the noise is not worth it,
@@
-52,9
+57,16
@@
function checkout_csit_for_vpp () {
set -exuo pipefail
case "${1}" in
set -exuo pipefail
case "${1}" in
+ "stable/2009")
+ # LTS branch
+ branch_id="origin/${1/stable\//oper-rls}_lts"
+ ;;
"stable/"*)
branch_id="origin/${1/stable\//oper-rls}"
;;
"stable/"*)
branch_id="origin/${1/stable\//oper-rls}"
;;
+ "rls"*)
+ branch_id="origin/oper-${1}"
+ ;;
*) # This includes "master".
branch_id="origin/oper"
esac
*) # This includes "master".
branch_id="origin/oper"
esac
@@
-79,5
+91,7
@@
function checkout_csit_for_vpp () {
else
git checkout "${csit_branch}" || die
fi
else
git checkout "${csit_branch}" || die
fi
+ git status || die
+ git log -1 || die
popd || die
}
popd || die
}