Rename integration tests packages to use artificats from matrix (#334)

Signed-off-by: Lukasz Woznicki <lukasz.woznicki@softwareag.com>

2 files changed, 85 insertions, 87 deletions

diff --git a/.github/workflows/build-workflow.yml b/.github/workflows/build-workflow.yml
index 0bce1aee..f92472ba 100644
--- a/.github/workflows/build-workflow.yml
+++ b/.github/workflows/build-workflow.yml
@@ -147,6 +147,9 @@ jobs:
       - name: Strip tedge_mapper
         run: arm-linux-gnueabihf-strip target/${{ matrix.target }}/release/tedge_mapper || aarch64-linux-gnu-strip target/${{ matrix.target }}/release/tedge_mapper
 
+      - name: Strip tedge_apt_plugin
+        run: arm-linux-gnueabihf-strip target/${{ matrix.target }}/release/tedge_apt_plugin || aarch64-linux-gnu-strip target/${{ matrix.target }}/release/tedge_apt_plugin
+
       - name: build tedge debian package for target
         uses: actions-rs/cargo@v1
         # https://github.com/marketplace/actions/rust-cargo
diff --git a/.github/workflows/integration-test-workflow.yml b/.github/workflows/integration-test-workflow.yml
index 2b6a750d..914b9dc1 100644
--- a/.github/workflows/integration-test-workflow.yml
+++ b/.github/workflows/integration-test-workflow.yml
@@ -2,7 +2,7 @@ name: integration-test-workflow
 
 on:
   workflow_dispatch:
-    branches: [ main ]
+    branches: [main]
   workflow_run:
     workflows: ["build-workflow"]
     branches: [main]
@@ -12,56 +12,52 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-
   install-and-use-amd64:
-
     runs-on: Ubuntu-20.04
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
 
     steps:
-        - name: checkout
-          uses: actions/checkout@v2
+      - name: checkout
+        uses: actions/checkout@v2
 
-        - name: Download artifact
-          uses: dawidd6/action-download-artifact@v2
-          # https://github.com/marketplace/actions/download-workflow-artifact
-          with:
-            github_token: ${{secrets.GITHUB_TOKEN}}
-            workflow: build-workflow.yml
-            workflow_conclusion: success
-            branch: main
-            name: debian-packages-amd64
-            path: debian-package_unpack
+      - name: Download artifact
+        uses: dawidd6/action-download-artifact@v2
+        # https://github.com/marketplace/actions/download-workflow-artifact
+        with:
+          github_token: ${{secrets.GITHUB_TOKEN}}
+          workflow: build-workflow.yml
+          workflow_conclusion: success
+          branch: main
+          name: debian-packages-amd64
+          path: debian-package_unpack
 
-        - name: purge
-          run: sudo dpkg -P mosquitto tedge tedge_mapper tedge_apt_plugin collectd-core
-          continue-on-error: true
+      - name: purge
+        run: sudo dpkg -P mosquitto tedge tedge_mapper tedge_apt_plugin collectd-core
+        continue-on-error: true
 
-        - name: install mosquitto
-          run: sudo apt-get --assume-yes install mosquitto
+      - name: install mosquitto
+        run: sudo apt-get --assume-yes install mosquitto
 
-          #install collectd-core
-        - name: install collectd-core
-          run:  sudo apt-get --assume-yes install collectd-core
+        #install collectd-core
+      - name: install collectd-core
+        run: sudo apt-get --assume-yes install collectd-core
 
-        - name: install packages
-          run: sudo dpkg -i ./debian-package_unpack/*.deb
+      - name: install packages
+        run: sudo dpkg -i ./debian-package_unpack/*.deb
 
-        - name: run tedge help
-          run: tedge --help
+      - name: run tedge help
+        run: tedge --help
 
-          #replace the default config file with tedge custom config file
-        - name: configure collectd
-          run: sudo cp "/etc/tedge/contrib/collectd/collectd.conf" "/etc/collectd/collectd.conf"
+        #replace the default config file with tedge custom config file
+      - name: configure collectd
+        run: sudo cp "/etc/tedge/contrib/collectd/collectd.conf" "/etc/collectd/collectd.conf"
 
   cargo-test-features:
-
     name: Run cargo test features
     runs-on: Ubuntu-20.04
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
 
     steps:
-
       - name: Checkout
         uses: actions/checkout@v2
 
@@ -89,62 +85,61 @@ jobs:
           args: --verbose --features integration-test -- --skip sending_and_receiving_a_message
 
   install-and-use-rpi:
-
     runs-on: [self-hosted, Linux, ARM]
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
 
     steps:
-        - name: checkout
-          uses: actions/checkout@v2
-
-        - name: Download artifact
-          uses: dawidd6/action-download-artifact@v2
-          # https://github.com/marketplace/actions/download-workflow-artifact
-          with:
-            github_token: ${{secrets.GITHUB_TOKEN}}
-            workflow: build-workflow.yml
-            workflow_conclusion: success
-            branch: main
-            name: debian-packages-armhf
-            path: debian-package_unpack
-
-        - name: purge
-          run: sudo dpkg -P mosquitto tedge tedge_mapper tedge_apt_plugin collectd-core
-          continue-on-error: true
-
-        - name: install mosquitto
-          run: sudo apt-get --assume-yes install mosquitto
-
-          #install collectd-core
-        - name: install collectd-core
-          run:  sudo apt-get --assume-yes install collectd-core
-
-        - name: install packages
-          run: sudo dpkg -i ./debian-package_unpack/*.deb
-
-        - name: run tedge help
-          run: tedge --help
-
-          #replace the default config file with tedge custom config file
-        - name: configure collectd
-          run: sudo cp "/etc/tedge/contrib/collectd/collectd.conf" "/etc/collectd/collectd.conf"
-
-        - name: Download artifact
-          uses: dawidd6/action-download-artifact@v2
-          # https://github.com/marketplace/actions/download-workflow-artifact
-          with:
-            github_token: ${{secrets.GITHUB_TOKEN}}
-            workflow: build-workflow.yml
-            workflow_conclusion: success
-            branch: main
-            name: examples_armhf
-            path: examples
-
-        - name: Run Smoke Test
-          run: ./ci/ci_smoke_test.sh
-          env:
-            C8YPASS: ${{ secrets.SECRET_C8YPASS }}
-            C8YUSERNAME: ${{ secrets.SECRET_C8YUSERNAME }}
-            C8YTENANT: ${{secrets.SECRET_C8YTENANT}}
-            C8YDEVICE: ${{ secrets.SECRET_C8YDEVICE }}
-            C8YDEVICEID: ${{ secrets.SECRET_C8YDEVICEID }}
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: Download artifact
+        uses: dawidd6/action-download-artifact@v2
+        # https://github.com/marketplace/actions/download-workflow-artifact
+        with:
+          github_token: ${{secrets.GITHUB_TOKEN}}
+          workflow: build-workflow.yml
+          workflow_conclusion: success
+          branch: main
+          name: debian-packages-armv7-unknown-linux-gnueabihf
+          path: debian-package_unpack
+
+      - name: purge
+        run: sudo dpkg -P mosquitto tedge tedge_mapper tedge_apt_plugin collectd-core
+        continue-on-error: true
+
+      - name: install mosquitto
+        run: sudo apt-get --assume-yes install mosquitto
+
+        #install collectd-core
+      - name: install collectd-core
+        run: sudo apt-get --assume-yes install collectd-core
+
+      - name: install packages
+        run: sudo dpkg -i ./debian-package_unpack/*.deb
+
+      - name: run tedge help
+        run: tedge --help
+
+        #replace the default config file with tedge custom config file
+      - name: configure collectd
+        run: sudo cp "/etc/tedge/contrib/collectd/collectd.conf" "/etc/collectd/collectd.conf"
+
+      - name: Download artifact
+        uses: dawidd6/action-download-artifact@v2
+        # https://github.com/marketplace/actions/download-workflow-artifact
+        with:
+          github_token: ${{secrets.GITHUB_TOKEN}}
+          workflow: build-workflow.yml
+          workflow_conclusion: success
+          branch: main
+          name: examples_armv7-unknown-linux-gnueabihf
+          path: examples
+
+      - name: Run Smoke Test
+        run: ./ci/ci_smoke_test.sh
+        env:
+          C8YPASS: ${{ secrets.SECRET_C8YPASS }}
+          C8YUSERNAME: ${{ secrets.SECRET_C8YUSERNAME }}
+          C8YTENANT: ${{secrets.SECRET_C8YTENANT}}
+          C8YDEVICE: ${{ secrets.SECRET_C8YDEVICE }}
+          C8YDEVICEID: ${{ secrets.SECRET_C8YDEVICEID }}