Merge branch 'features-dockerbuild' of...

Merge branch 'features-dockerbuild' of gitlab.demlabs.net:cellframe/cellframe-node into features-dockerbuild

.gitlab-ci.yml

@@ -3,7 +3,6 @@ variables:
 
 stages:
     - build
-    - pack
     - deploy
 
 .ci-polygon:
@@ -14,18 +13,12 @@ stages:
   extends: .ci-polygon
   stage: build
   image: ubuntu:20.04
+  timeout: 3 hours 30 minutes
   dependencies: []
   artifacts:
-      expire_in: 1h
-      paths:
-        - build_*
+    paths:
+      - build_*/*.deb
 
-.pack:
-  extends: .ci-polygon
-  image: ubuntu:20.04
-  stage: pack
-  before_script: /opt/buildtools/prepare_environment.sh
-  
 .deploy:
   extends: .ci-polygon
   image: ubuntu:20.04
@@ -36,66 +29,46 @@ stages:
 cellframe-node_x86_64-linux-gnu:
     extends: .build
     before_script: /opt/buildtools/prepare_environment.sh x86_64-linux-gnu 
-    script: ./prod_build/build.sh x86_64-linux-gnu release
-
-cellframe-node-dbg_x86_64-linux-gnu:
-    extends: .build
-    before_script: /opt/buildtools/prepare_environment.sh x86_64-linux-gnu 
-    script: ./prod_build/build.sh x86_64-linux-gnu debug
-        
+    script: 
+      - ./prod_build/build.sh x86_64-linux-gnu release
+      - ./prod_build/pack.sh x86_64-linux-gnu release
 
 cellframe-node_armhf-linux-gnu:
     extends: .build
-    image: raspbian/stretch
-    before_script: /opt/buildtools/prepare_environment.sh armhf-linux-gnu
-    script: ./prod_build/build.sh armhf-linux-gnu release
+    image: arm32v7/debian
 
-
-cellframe-node-dbg_armhf-linux-gnu:
-    extends: .build
-    image: raspbian/stretch
     before_script: /opt/buildtools/prepare_environment.sh armhf-linux-gnu
-    script: ./prod_build/build.sh armhf-linux-gnu debug
-    
+    script: 
+      - ./prod_build/build.sh armhf-linux-gnu release
+      - ./prod_build/pack.sh armhf-linux-gnu release
+
 cellframe-node_aarch64-linux-gnu:
     extends: .build
     image: arm64v8/ubuntu
     before_script: /opt/buildtools/prepare_environment.sh armhf-linux-gnu
-    script: ./prod_build/build.sh aarch64-linux-gnu release
+    script: 
+      - ./prod_build/build.sh aarch64-linux-gnu release
+      - ./prod_build/pack.sh aarch64-linux-gnu release
 
 
-cellframe-node-dbg_aarch64-linux-gnu:
-    extends: .build
-    image: arm64v8/ubuntu
-    before_script: /opt/buildtools/prepare_environment.sh aarch64-linux-gnu
-    script: ./prod_build/build.sh aarch64-linux-gnu debug
+#cellframe-node-dbg_aarch64-linux-gnu:
+#    extends: .build
+#    image: arm64v8/ubuntu
+#    before_script: /opt/buildtools/prepare_environment.sh aarch64-linux-gnu
+#    script: ./prod_build/build.sh aarch64-linux-gnu debug
     
-pack-deb:
-  extends: .pack
+  
+
+deploy:
+  extends: .deploy
   needs: 
     - cellframe-node_x86_64-linux-gnu 
-    - cellframe-node-dbg_x86_64-linux-gnu 
+ #   - cellframe-node-dbg_x86_64-linux-gnu 
     - cellframe-node_aarch64-linux-gnu 
-    - cellframe-node-dbg_aarch64-linux-gnu
+  #  - cellframe-node-dbg_aarch64-linux-gnu
     - cellframe-node_armhf-linux-gnu 
-    - cellframe-node-dbg_armhf-linux-gnu 
-
-  script: 
-    - ./prod_build/pack.sh x86_64-linux-gnu release
-    - ./prod_build/pack.sh x86_64-linux-gnu debug
-    - ./prod_build/pack.sh aarch64-linux-gnu release
-    - ./prod_build/pack.sh aarch64-linux-gnu debug
-    - ./prod_build/pack.sh armhf-linux-gnu release
-    - ./prod_build/pack.sh armhf-linux-gnu debug
-    
+   # - cellframe-node-dbg_armhf-linux-gnu 
 
-  artifacts:
-    paths:
-      - build_*/*.deb
-
-deploy:
-  extends: .deploy
-  needs: [pack-deb]
   script: 
     - /opt/buildtools/deploy_files.sh pub linux/$CI_COMMIT_REF_NAME/ build_*/*.deb