Merge branch 'devel/anchors' of Freifunk-Troisdorf/gluon-ci into multidomain

was missing an anchor
...
2020-04-13 20:10:42 +00:00 · 2020-02-21 21:39:39 +01:00 · 2020-02-21 21:37:48 +01:00 · 2020-02-21 21:36:49 +01:00 · 2020-02-21 21:29:46 +01:00 · 2020-02-21 21:24:42 +01:00
1 changed files with 164 additions and 312 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,13 +1,38 @@
 global-variables:
-  input_version: &input_version v2020.1
+  env: &env
+    image: hoffmannhosting/gluon-builder
+    environment:
+      input_version: v2020.1
+      GLUON_SITEDIR: /drone/src/site
+      FORCE_UNSAFE_CONFIGURE: 1
+
+  gluon: &gluon
+    <<: *env
+    commands:
+      - cd gluon
+      - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
+      - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
+      - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+
+  upload: &upload
+    image: appleboy/drone-scp
+    settings:
+      host: 46.4.138.183
+      user: fwupload
+      key:
+        from_secret: ssh-update
+      strip_components: 6
+    when:
+      branch: master

 kind: pipeline
+type: docker
 name: gluon-build

 clone:
  depth: 50

-steps:
+steps: &steps
  - name: submodules
    image: docker:git
    commands:
@ -20,321 +45,149 @@ steps:
    - git checkout multidomain

  - name: make update
-  image: hoffmannhosting/gluon-builder
+    <<: *env
    commands:
    - cd gluon
    - make update
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: ar71xx-generic
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: build-ath79-generic
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: ath79-generic
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: build-ar71xx-generic
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: ar71xx-generic
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: build-ar71xx-tiny
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: ar71xx-tiny
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: build-ar71xx-nand
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: ar71xx-nand
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: build-brcm2708-bcm2708
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: brcm2708-bcm2708
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: build-brcm2708-bcm2709
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: brcm2708-bcm2709
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: build-mpc85xx-generic
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: mpc85xx-generic
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: build-mpc85xx-p1020
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: mpc85xx-p1020
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: build-x86-generic
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: x86-generic
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: build-x86-geode
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: x86-geode
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: build-x86-64
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: x86-64
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: build-ipq40xx-generic
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: ipq40xx-generic
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: ipq806x-generic
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: ipq806x-generic
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: build-ramips-mt7620
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: ramips-mt7620
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: build-ramips-mt7621
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: ramips-mt7621
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: build-ramips-mt76x8
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: ramips-mt76x8
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: build-ramips-rt305x
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: ramips-rt305x
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: lantiq-xway
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: lantiq-xway
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: lantiq-xrx200
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+    <<: *gluon
    environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
      GLUON_TARGET: lantiq-xrx200
-    FORCE_UNSAFE_CONFIGURE: 1

  - name: make manifest
-  image: hoffmannhosting/gluon-builder
+    <<: *env
    commands:
    - cd gluon
    - 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
    - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    FORCE_UNSAFE_CONFIGURE: 1

- name: backup-old-firmware
-  image: appleboy/drone-ssh
-  settings:
-    host: 46.4.138.183
-    username: fwupload
-    key:
-      from_secret: ssh-update
-    port: 22
-    command_timeout: 120m
-    script:
-      #- ./rsync-backup-multi.sh
-      - rm -rf /srv/fwuploads/troisdorf/multi/*
-      - mkdir /srv/fwuploads/troisdorf/multi/stable
-      - mkdir /srv/fwuploads/troisdorf/multi/beta
-      - mkdir /srv/fwuploads/troisdorf/multi/experimental
+#  - name: backup-old-firmware
+#    image: appleboy/drone-ssh
+#    settings:
+#      host: 46.4.138.183
+#      username: fwupload
+#      key:
+#        from_secret: ssh-update
+#      port: 22
+#      command_timeout: 120m
+#      script:
+#        #- ./rsync-backup-multi.sh
+#        - rm -rf /srv/fwuploads/troisdorf/multi/*
+#        - mkdir /srv/fwuploads/troisdorf/multi/stable
+#        - mkdir /srv/fwuploads/troisdorf/multi/beta
+#        - mkdir /srv/fwuploads/troisdorf/multi/experimental
+#    when:
+#      branch: master

  - name: upload stable
-  image: appleboy/drone-scp
+    <<: *upload
    settings:
-    host: 46.4.138.183
-    user: fwupload
-    key:
-      from_secret: ssh-update
-    strip_components: 6
      target: /srv/fwuploads/troisdorf/multi/stable
      source: /drone/src/gluon/output/stable/images/*

  - name: upload beta
-  image: appleboy/drone-scp
+    <<: *upload
    settings:
-    host: 46.4.138.183
-    user: fwupload
-    key:
-      from_secret: ssh-update
-    strip_components: 6
      target: /srv/fwuploads/troisdorf/multi/beta
      source: /drone/src/gluon/output/beta/images/*

  - name: upload experimental
-  image: appleboy/drone-scp
+    <<: *upload
    settings:
-    host: 46.4.138.183
-    user: fwupload
-    key:
-      from_secret: ssh-update
-    strip_components: 6
      target: /srv/fwuploads/troisdorf/multi/experimental
      source: /drone/src/gluon/output/experimental/images/*

@ -344,4 +197,3 @@ steps:
      webhook:
        from_secret: slack_webhook
      channel: fftdf_firmware
-
Author	SHA1	Message	Date
stefan	3b50784d2d	Merge branch 'devel/anchors' of Freifunk-Troisdorf/gluon-ci into multidomain Some checks reported errors continuous-integration/drone/push Build was killed Details	2020-04-13 20:10:42 +00:00
Nils Jakobi	5fec7cf823	was missing an anchor Some checks reported errors continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build was killed Details	2020-02-21 21:39:39 +01:00
Nils Jakobi	aa75b902c7	... Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2020-02-21 21:37:48 +01:00
Nils Jakobi	0a0f420f5e	drone doesn't like the order Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2020-02-21 21:36:49 +01:00
Nils Jakobi	4a4ff673e6	fixed whitespace that was causing errors Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2020-02-21 21:29:46 +01:00
Nils Jakobi	68accc48fc	enable uploads Some checks reported errors continuous-integration/drone/push Build was killed Details	2020-02-21 21:24:42 +01:00
Nils Jakobi	afb4c433ad	reenable all build jobs Some checks reported errors continuous-integration/drone/push Build was killed Details	2020-02-21 21:21:03 +01:00
Nils Jakobi	1c34af97a4	fixed whitespace Some checks reported errors continuous-integration/drone/push Build was killed Details	2020-02-21 21:20:13 +01:00
Nils Jakobi	9adb507643	... Some checks reported errors continuous-integration/drone/push Build was killed Details	2020-02-21 21:03:05 +01:00
Nils Jakobi	77f9469825	... more fixing? Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2020-02-21 21:02:21 +01:00
Nils Jakobi	a1a4f30591	fixed an anchor	2020-02-21 21:01:10 +01:00
Nils Jakobi	5937c32e62	re-enabled all other stuff	2020-02-21 20:59:21 +01:00
Nils Jakobi	88eecb90bd	testing conditionals All checks were successful continuous-integration/drone/push Build is passing Details	2020-02-21 20:57:44 +01:00
Nils Jakobi	4641648897	debugging anchors All checks were successful continuous-integration/drone/push Build is passing Details	2020-02-21 20:50:17 +01:00
Nils Jakobi	96c0b82aaf	trying to fix anchors	2020-02-21 20:37:43 +01:00
Nils Jakobi	0b18bc77be	more testing	2020-02-21 20:37:01 +01:00
Nils Jakobi	751bdb0248	testing more	2020-02-21 20:32:49 +01:00
Nils Jakobi	8849a9d2bb	debugging... All checks were successful continuous-integration/drone/push Build is passing Details	2020-02-21 20:32:02 +01:00
Nils Jakobi	297f84b8fc	add conditional check to upload only on master branch Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2020-02-21 20:28:51 +01:00
Nils Jakobi	289027569f	now using anchors Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2020-02-21 20:10:56 +01:00