diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2016-11-24 18:43:06 +0100 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2016-11-24 18:43:06 +0100 |
| commit | 08cb4c01450c77e8eecdfacb63c5c9a8bad256f9 (patch) | |
| tree | 24b91265f187e22055707b7aae231a065a703158 | |
| parent | 3a6addeec4c8f295ed8c87b5db32e3e203e6f66d (diff) | |
Convert feature.inc to feature.dep
This converts the included features used for CI purposes to use the
dependency format introduced.
Change-Id: I405af9ffbd6954d0e78b5f738e762a80687337d7
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
| -rwxr-xr-x | scripts/.aglsetup_genconfig.bash | 21 | ||||
| -rw-r--r-- | templates/feature/agl-ci-change-features/included.dep (renamed from templates/feature/agl-ci-change-features/included.inc) | 0 | ||||
| -rw-r--r-- | templates/feature/agl-ci-snapshot-features/included.dep (renamed from templates/feature/agl-ci-snapshot-features/included.inc) | 0 |
3 files changed, 0 insertions, 21 deletions
diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash index 31520a7cc..285ecee50 100755 --- a/scripts/.aglsetup_genconfig.bash +++ b/scripts/.aglsetup_genconfig.bash @@ -123,24 +123,6 @@ function find_feature_dir() { return 1 } -function process-feature-shortcuts() { - TOCHECK=$1 - debug "processing feature shortcut $TOCHECK" - if $(echo "$FEATURES" | grep -q "$TOCHECK" 2>&1 ) ; then - featuredir=$(find_feature_dir $TOCHECK) - if test -d $featuredir; then - tmpfeatures="$FEATURES $(cat $featuredir/included.inc)" - tmpfeatures_uniq=$(echo $tmpfeatures | sed -e "s/$TOCHECK//g" -e 's/ / /g' | tr "[:blank:]" "\n" | sort -u ) - export FEATURES=$tmpfeatures_uniq - debug "Features used: $FEATURES" - else - error "No feature directory with this name: $TOCHECK" - exit 1 - fi - fi -} - - function usage() { cat <<EOF >&2 Usage: . $SCRIPT [options] [feature [feature [... ]]] @@ -324,9 +306,6 @@ verbose "Command line arguments: ${GLOBAL_ARGS[@]}" # the remaining args are the features FEATURES="$@" -process-feature-shortcuts agl-all-features -process-feature-shortcuts agl-ci-change-features -process-feature-shortcuts agl-ci-snapshot-features # validate the machine list debug "validating machines list" diff --git a/templates/feature/agl-ci-change-features/included.inc b/templates/feature/agl-ci-change-features/included.dep index 4d528e4f4..4d528e4f4 100644 --- a/templates/feature/agl-ci-change-features/included.inc +++ b/templates/feature/agl-ci-change-features/included.dep diff --git a/templates/feature/agl-ci-snapshot-features/included.inc b/templates/feature/agl-ci-snapshot-features/included.dep index 123de78b7..123de78b7 100644 --- a/templates/feature/agl-ci-snapshot-features/included.inc +++ b/templates/feature/agl-ci-snapshot-features/included.dep |