X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-set-scenario.sh;h=2c35f2780141fcede14eec36b8dc4644540e7bdf;hb=4fc988b325df2d028463bef72820850b8d3111d7;hp=c28093d274941d16cca23188080928832f623e8b;hpb=9380666a19dc94aa270730b40517e51a9f318958;p=releng.git diff --git a/jjb/xci/xci-set-scenario.sh b/jjb/xci/xci-set-scenario.sh index c28093d27..2c35f2780 100755 --- a/jjb/xci/xci-set-scenario.sh +++ b/jjb/xci/xci-set-scenario.sh @@ -8,6 +8,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## set -o pipefail +set -x #---------------------------------------------------------------------- # This script is used by CI and executed by Jenkins jobs. @@ -38,7 +39,7 @@ set -o pipefail # skip-verify # skip-deployment # force-verify -function override_generic_scenario() { +function override_scenario() { echo "Processing $GERRIT_PROJECT patchset $GERRIT_REFSPEC" # ensure the metadata we record is consistent for all types of patches including skipped ones @@ -81,26 +82,21 @@ function override_generic_scenario() { fi } -# This function determines the impacted generic scenario by processing the -# change and using diff to see what changed. If changed files belong to a scenario -# its name gets recorded for deploying and testing the right scenario. +# This function determines the default scenario for changes coming to releng-xci +# by processing the Gerrit change and using diff to see what changed. # -# Pattern to be searched in Changeset -# releng-xci/scenarios//: -# releng-xci/xci/installer/osa/: os-nosdn-nofeature -# releng-xci/xci/installer/kubespray/: k8-nosdn-nofeature -# the rest: os-nosdn-nofeature -function determine_generic_scenario() { +# The stuff in releng-xci is for the installer and other common things so the +# determination is based on those. +# +# Pattern +# releng-xci/installer//: +function determine_default_scenario() { echo "Processing $GERRIT_PROJECT patchset $GERRIT_REFSPEC" # get the changeset cd $WORKSPACE - SCENARIOS=$(git diff HEAD^..HEAD --name-only -- 'xci/scenarios' | cut -d "/" -f 3 | uniq) # We need to set default scenario for changes that mess with installers INSTALLERS=$(git diff HEAD^..HEAD --name-only -- 'xci/installer' | cut -d "/" -f 3 | uniq) - for CHANGED_SCENARIO in $SCENARIOS; do - DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]=$CHANGED_SCENARIO - done for CHANGED_INSTALLER in $INSTALLERS; do case $CHANGED_INSTALLER in kubespray) @@ -113,24 +109,25 @@ function determine_generic_scenario() { esac done # For all other changes, we only need to set a default scenario if it's not set already - if git diff HEAD^..HEAD --name-only | grep -q -v 'xci/installer\|xci/scenario'; then + if git diff HEAD^..HEAD --name-only | grep -q -v 'xci/installer'; then [[ ${#DEPLOY_SCENARIO[@]} -eq 0 ]] && DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature' fi # extract releng-xci sha XCI_SHA=$(cd $WORKSPACE && git rev-parse HEAD) - # extract scenario sha which is same as releng-xci sha for generic scenarios + # TODO: we need to fix this so we actually extract the scenario sha by cloning releng-xci-scenarios + # for the determined scenario. it is crucial for promotion... SCENARIO_SHA=$XCI_SHA } -# This function determines the impacted external scenario by processing the Gerrit +# This function determines the impacted scenario by processing the Gerrit # change and using diff to see what changed. If changed files belong to a scenario # its name gets recorded for deploying and testing the right scenario. # # Pattern # /scenarios//: -function determine_external_scenario() { +function determine_scenario() { echo "Processing $GERRIT_PROJECT patchset $GERRIT_REFSPEC" # remove the clone that is done via jenkins and place releng-xci there so the @@ -156,6 +153,45 @@ function determine_external_scenario() { SCENARIO_SHA=$(cd $WORK_DIRECTORY/$GERRIT_PROJECT && git rev-parse HEAD) } +# This function allows developers to specify the specific XCI flavor for the +# impacted scenario by adding the XCI Flavor info about the specific scenario. +# This results in either skipping the real verification +# totally or skipping the determining the installer and scenario programmatically. +# It is important to note that this feature is only available to generic scenarios +# and only single installer/scenario pair is allowed. +# The input in commit message should be placed at the end of the commit message body, +# before the signed-off and change-id lines. +# +# Pattern to be searched in Commit Message +# xci-flavor: +# Examples: +# xci-flavor:noha +function override_xci_flavor() { + echo "Processing $GERRIT_PROJECT patchset $GERRIT_REFSPEC" + + # process commit message for XCI Flavor + if [[ "$GERRIT_CHANGE_COMMIT_MESSAGE" =~ "xci-flavor:" ]]; then + XCI_FLAVOR=$(echo $GERRIT_CHANGE_COMMIT_MESSAGE | awk '/xci-flavor:/' RS=" " | cut -d":" -f2) + + if [[ -z "$XCI_FLAVOR" ]]; then + XCI_FLAVOR='mini' + echo "XCI flavor is not specified. The default is specified instead (i.e. mini). Falling back to programmatically determining them." + echo "XCI_FLAVOR=mini" >> $WORK_DIRECTORY/scenario.properties + exit 0 + else + echo "Recording the XCI flavor '$XCI_FLAVOR' for downstream jobs" + echo "XCI_FLAVOR=$XCI_FLAVOR" >> $WORK_DIRECTORY/scenario.properties + exit 0 + fi + else + XCI_FLAVOR='mini' + echo "XCI flavor is not specified. The default is specified instead (i.e. mini). Falling back to programmatically determining them." + echo "XCI_FLAVOR=mini" >> $WORK_DIRECTORY/scenario.properties + exit 0 + fi + +} + echo "Determining the impacted scenario" declare -a DEPLOY_SCENARIO @@ -169,11 +205,12 @@ WORK_DIRECTORY=/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO /bin/rm -rf $WORK_DIRECTORY && mkdir -p $WORK_DIRECTORY if [[ $GERRIT_PROJECT == "releng-xci" ]]; then - override_generic_scenario - determine_generic_scenario + determine_default_scenario else - determine_external_scenario + determine_scenario + override_xci_flavor fi +override_scenario # ensure single scenario is impacted if [[ $(IFS=$'\n' echo ${DEPLOY_SCENARIO[@]} | wc -w) != 1 ]]; then