prepare yml conf for dynamic target selecting

.gitlab-ci.yml

 variables:
   GLUON_BRANCH: "nightly"
   ECDSA_PRIVAT_KEY: "d8b6b90da391e2b8fdf1fec1499539937a35abcea79f2c3c15ae2f9edb5c455f"
-  GLUON_VERSION: "v2016.1.3"
+  GLUON_VERSION: "v2016.1.x"
 
 stages:
   - build
   - sign
   - deploy
 
-build:ar71xx-generic:
+build:gluon:
   stage: build
   only:
     - master
@@ -16,7 +16,7 @@ build:ar71xx-generic:
   tags:
     - firmware
   script:
-    - bash build/build-ar71xx-generic.sh $GLUON_BRANCH $GLUON_VERSION
+    - bash build/target.sh $GLUON_BRANCH $GLUON_VERSION
   artifacts:
     paths:
       - output/images/factory/*wr841*
@@ -24,13 +24,6 @@ build:ar71xx-generic:
       - output/images/sysupgrade/*wr841*
       - contrib/
 
-#build:ar71xx-nand:
-#  stage: build
-#  tags:
-#    - firmware
-#  script:
-#    - bash build/build-ar71xx-nand.sh
-
 sign:
   stage: sign
   only:
@@ -41,8 +34,7 @@ sign:
   script:
     - bash build/sign.sh $GLUON_BRANCH $ECDSA_PRIVAT_KEY
   dependencies:
-    - build:ar71xx-generic
-#    - build:ar71xx-nand
+    - build:gluon
   artifacts:
     paths:
       - output/images/