Merge branch 'master' into bearMaster

yophilav · Nov 19, 2020 · 954e776 · 954e776
2 parents 7ab2393 + d3defcc
commit 954e776
Show file tree

Hide file tree

Showing 263 changed files with 9,901 additions and 4,663 deletions.
diff --git a/.github/workflows/nightly-merge.yml b/.github/workflows/nightly-merge.yml
diff --git a/builds/checkin/api-proxy.yaml b/builds/checkin/api-proxy.yaml
@@ -55,7 +55,7 @@ jobs:
         displayName: Modify path
       - bash: scripts/linux/generic-rust/install.sh --project-root "edge-modules/api-proxy-module"
         displayName: Install Rust
-      - bash: scripts/linux/cross-platform-rust-build.sh --os ubuntu18.04 --arch arm32v7 --build-path edge-modules/api-proxy-module
+      - bash: scripts/linux/cross-platform-rust-build.sh --os alpine --arch arm32v7 --build-path edge-modules/api-proxy-module
         displayName: build        
  # No arm platform specific test. Our cross build tool does not work for dependancies outside the compile repo so another script is used to compile.
  # That script can only build, but can't run tests for now.
@@ -75,7 +75,7 @@ jobs:
         displayName: Modify path
       - bash: scripts/linux/generic-rust/install.sh --project-root "edge-modules/api-proxy-module"
         displayName: Install Rust
-      - bash: scripts/linux/cross-platform-rust-build.sh --os ubuntu18.04 --arch aarch64 --build-path edge-modules/api-proxy-module
+      - bash: scripts/linux/cross-platform-rust-build.sh --os alpine --arch aarch64 --build-path edge-modules/api-proxy-module
         displayName: build   
  # No arm platform specific test. Our cross build tool does not work for dependancies outside the compile repo so another script is used to compile.
  # That script can only build, but can't run tests for now.
diff --git a/builds/checkin/mqtt.yaml b/builds/checkin/mqtt.yaml
@@ -5,14 +5,16 @@ pr:
       - master
       - release/*
 jobs:
-
   ################################################################################
   - job: check_run_pipeline
-    ################################################################################
+  ################################################################################
     displayName: Check pipeline preconditions (changes ARE in builds or mqtt)
     pool:
       vmImage: "ubuntu-16.04"
     steps:
+      - checkout: self
+        submodules: false
+        fetchDepth: 3
       - bash: |
           git log -m -1 --name-only --first-parent --pretty="" | egrep -i '^(builds|mqtt)'
           if [[ $? == 0 ]]; then
@@ -24,13 +26,16 @@ jobs:
 
   ################################################################################
   - job: linux_amd64
-    ################################################################################
+  ################################################################################
     displayName: Linux amd64
     dependsOn: check_run_pipeline
     condition: eq(dependencies.check_run_pipeline.outputs['check_files.RUN_PIPELINE'], 'true')
     pool:
       vmImage: "ubuntu-16.04"
     steps:
+      - checkout: self
+        submodules: false # mqtt broker does not use submodules
+        fetchDepth: 3
       - script: echo "##vso[task.setvariable variable=RUST_BACKTRACE;]1"
         displayName: Set env variables
       - bash: scripts/linux/generic-rust/install.sh --project-root "mqtt"
@@ -39,18 +44,28 @@ jobs:
         displayName: Build with no default features
       - bash: scripts/linux/generic-rust/build.sh --project-root "mqtt" --packages "mqttd/Cargo.toml" --manifest-path
         displayName: Build with default features
-      - bash: mqtt/build/linux/test.sh
+      - bash: mqtt/build/linux/test.sh --report test-results.xml
         displayName: Test
+      - task: PublishTestResults@2
+        displayName: Publish test results
+        inputs:
+          testResultsFormat: "JUnit"
+          testResultsFiles: "**/test-results.xml"
+          failTaskOnFailedTests: true
+        condition: succeededOrFailed()
 
   ################################################################################
   - job: style_check
-    ################################################################################
+  ################################################################################
     displayName: Style Check
     dependsOn: check_run_pipeline
     condition: eq(dependencies.check_run_pipeline.outputs['check_files.RUN_PIPELINE'], 'true')
     pool:
       vmImage: "ubuntu-16.04"
     steps:
+      - checkout: self
+        submodules: false # mqtt broker does not use submodules
+        fetchDepth: 3
       - bash: scripts/linux/generic-rust/install.sh --project-root "mqtt"
         displayName: Install Rust
       - bash: scripts/linux/generic-rust/format.sh --project-root "mqtt"

diff --git a/builds/ci/mqtt.yaml b/builds/ci/mqtt.yaml
@@ -13,6 +13,9 @@ jobs:
     pool:
       vmImage: "ubuntu-16.04"
     steps:
+      - checkout: self
+        submodules: false
+        fetchDepth: 3
       - bash: |
           git log -m -1 --name-only --first-parent --pretty="" | egrep -i '^(builds|mqtt)'
           if [[ $? == 0 ]]; then
@@ -31,6 +34,9 @@ jobs:
     pool:
       vmImage: 'ubuntu-16.04'
     steps:
+      - checkout: self
+        submodules: false # mqtt broker does not use submodules
+        fetchDepth: 3
       - task: Bash@3
         displayName: Install Rust
         inputs:
@@ -50,6 +56,14 @@ jobs:
         displayName: Test
         inputs:
           filePath: mqtt/build/linux/test.sh
+          arguments: --report test-results.xml
+      - task: PublishTestResults@2
+        displayName: Publish test results
+        inputs:
+          testResultsFormat: "JUnit"
+          testResultsFiles: "**/test-results.xml"
+          failTaskOnFailedTests: true
+        condition: succeededOrFailed()
 
 ################################################################################
   - job: linux_arm32v7
@@ -60,6 +74,9 @@ jobs:
     pool:
       vmImage: 'ubuntu-16.04'
     steps:
+      - checkout: self
+        submodules: false # mqtt broker does not use submodules
+        fetchDepth: 3
       - script: |
           echo "##vso[task.setvariable variable=RUSTUP_HOME;]$(Agent.WorkFolder)/rustup"
           echo "##vso[task.setvariable variable=CARGO_HOME;]$(Agent.WorkFolder)/cargo"
@@ -73,41 +90,24 @@ jobs:
       - script: cargo install cross --version 0.1.16
         displayName: Install cross
       - task: Bash@3
-        displayName: Build
+        displayName: Build with no default features
         inputs:
           filePath: scripts/linux/generic-rust/build.sh
           arguments: --project-root "mqtt" --packages "mqttd/Cargo.toml" --manifest-path --no-default-features --features "generic" --target armv7-unknown-linux-gnueabihf --cargo cross
       - task: Bash@3
-        displayName: Build
+        displayName: Build with default features
         inputs:
           filePath: scripts/linux/generic-rust/build.sh
           arguments: --project-root "mqtt" --packages "mqttd/Cargo.toml" --manifest-path --target armv7-unknown-linux-gnueabihf --cargo cross
       - task: Bash@3
         displayName: Test
         inputs:
           filePath: mqtt/build/linux/test.sh
-          arguments: --target armv7-unknown-linux-gnueabihf --cargo cross
-
-################################################################################
-  - job: style_check
-################################################################################
-    displayName: Style Check
-    dependsOn: check_run_pipeline
-    condition: eq(dependencies.check_run_pipeline.outputs['check_files.RUN_PIPELINE'], 'true')
-    pool:
-      vmImage: 'ubuntu-16.04'
-    steps:
-      - task: Bash@3
-        displayName: Install Rust
-        inputs:
-          filePath: scripts/linux/generic-rust/install.sh
-          arguments: --project-root "mqtt"
-      - task: Bash@3
-        displayName: Format Code
-        inputs:
-          filePath: scripts/linux/generic-rust/format.sh
-          arguments: --project-root "mqtt"
-      - task: Bash@3
-        displayName: Clippy
+          arguments: --target armv7-unknown-linux-gnueabihf --cargo cross --report test-results.xml
+      - task: PublishTestResults@2
+        displayName: Publish test results
         inputs:
-          filePath: mqtt/build/linux/clippy.sh
+          testResultsFormat: "JUnit"
+          testResultsFiles: "**/test-results.xml"
+          failTaskOnFailedTests: true
+        condition: succeededOrFailed()
diff --git a/builds/e2e/Runner.ps1 b/builds/e2e/Runner.ps1