Browse code

Merge "remove generic extras.d support"

Jenkins authored on 2015/12/15 21:47:54
Showing 1 changed files
... ...
@@ -1760,17 +1760,18 @@ function run_phase {
1760 1760
     if [[ -d $TOP_DIR/extras.d ]]; then
1761 1761
         local extra_plugin_file_name
1762 1762
         for extra_plugin_file_name in $TOP_DIR/extras.d/*.sh; do
1763
-            [[ -r $extra_plugin_file_name ]] && source $extra_plugin_file_name $mode $phase
1764
-            # NOTE(sdague): generate a big warning about using
1765
-            # extras.d in an unsupported way which will let us track
1766
-            # unsupported usage in the gate.
1763
+            # NOTE(sdague): only process extras.d for the 3 explicitly
1764
+            # white listed elements in tree. We want these to move out
1765
+            # over time as well, but they are in tree, so we need to
1766
+            # manage that.
1767 1767
             local exceptions="50-ironic.sh 60-ceph.sh 80-tempest.sh"
1768 1768
             local extra
1769 1769
             extra=$(basename $extra_plugin_file_name)
1770 1770
             if [[ ! ( $exceptions =~ "$extra" ) ]]; then
1771
-                deprecated "extras.d support is being removed in Mitaka-1"
1772
-                deprecated "jobs for project $extra will break after that point"
1773
-                deprecated "please move project to a supported devstack plugin model"
1771
+                warn "use of extras.d is no longer supported"
1772
+                warn "processing of project $extra is skipped"
1773
+            else
1774
+                [[ -r $extra_plugin_file_name ]] && source $extra_plugin_file_name $mode $phase
1774 1775
             fi
1775 1776
         done
1776 1777
     fi