Beta, Stable 2020.2.2

.drone.yml

@@ -10,7 +10,10 @@ global-variables:
     <<: *env
     commands:
       - cd gluon
-      - make -j6 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+      - make -j6 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
+      - make -j6 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
+# Don´t build Experimental. The Experimental Firmware is in another Branch
+#      - make -j6 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
 
   upload: &upload
     image: appleboy/drone-scp
@@ -21,7 +24,7 @@ global-variables:
         from_secret: ssh-update
       strip_components: 6
     when:
-      branch: experimental
+      branch: multidomain
 
   patch: &patch
     <<: *env
@@ -47,7 +50,7 @@ steps: &steps
     image: docker:git
     commands:
     - cd site
-    - git checkout multidomain-experimental
+    - git checkout multidomain
 
   - name: make update
     <<: *env
@@ -159,7 +162,10 @@ steps: &steps
     <<: *env
     commands:
     - cd gluon
-    - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp
+    - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable
+    - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta
+# Don´t build Experimental. The Experimental Firmware is in another Branch
+#    - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp
 
   - name: backup-old-firmware
     image: appleboy/drone-ssh
@@ -172,16 +178,31 @@ steps: &steps
       command_timeout: 120m
       script:
         #- ./rsync-backup-multi.sh
-        - rm -rf /srv/fwuploads/troisdorf/multi/experimental
-        - mkdir /srv/fwuploads/troisdorf/multi/experimental
+        - rm -rf /srv/fwuploads/troisdorf/multi/stable
+        - rm -rf /srv/fwuploads/troisdorf/multi/beta
+        - mkdir /srv/fwuploads/troisdorf/multi/stable
+        - mkdir /srv/fwuploads/troisdorf/multi/beta
     when:
-      branch: experimental
+      branch: multidomain
 
-  - name: upload experimental
+  - name: upload stable
     <<: *upload
     settings:
-      target: /srv/fwuploads/troisdorf/multi/experimental
-      source: /drone/src/gluon/output/experimental/images/*
+      target: /srv/fwuploads/troisdorf/multi/stable
+      source: /drone/src/gluon/output/stable/images/*
+
+  - name: upload beta
+    <<: *upload
+    settings:
+      target: /srv/fwuploads/troisdorf/multi/beta
+      source: /drone/src/gluon/output/beta/images/*
+
+# Don´t build Experimental. The Experimental Firmware is in another Branch
+#  - name: upload experimental
+#    <<: *upload
+#    settings:
+#      target: /srv/fwuploads/troisdorf/multi/experimental
+#      source: /drone/src/gluon/output/experimental/images/*
 
   - name: slack
     image: plugins/slack

gluon

@@ -1 +1 @@
-Subproject commit 43954dd1652b44ed0618c98e44fad05dae3fa25a
+Subproject commit 90d0e33c619cef9e0af928ef4d6477f6c1bdc0de