new way

analogdevicesinc · Apr 15, 2024 · 1cfe80f · 1cfe80f
1 parent 8e20c3b
commit 1cfe80f
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -58,23 +58,33 @@ jobs:
       debian_bookworm:
         image: 'tfcollins/libiio_debian_bookworm-ci:latest'
         artifactName: 'Linux-Debian-12'
-        build_script: ci-debian.sh
+        build_script: ci-linux.sh
+        OS_TYPE: default
+        PACKAGE_TO_INSTALL: '/ci/build/*.deb'
       centos_7:
         image: 'tfcollins/libiio_centos_7-ci:latest'
         artifactName: 'Linux-CentOS-7'
-        build_script: ci-centos.sh
+        build_script: ci-linux.sh
+        OS_TYPE: centos
+        PACKAGE_TO_INSTALL: '/ci/build/*.rpm'
       fedora28:
         image: 'tfcollins/libiio_fedora_28-ci:latest'
         artifactName: 'Linux-Fedora-28'
-        build_script: ci-centos.sh
+        build_script: ci-linux.sh
+        OS_TYPE: centos
+        PACKAGE_TO_INSTALL: '/ci/build/*.rpm'
       fedora34:
         image: 'tfcollins/libiio_fedora_34-ci:latest'
         artifactName: 'Linux-Fedora-34'
-        build_script: ci-centos.sh
+        build_script: ci-linux.sh
+        OS_TYPE: centos
+        PACKAGE_TO_INSTALL: '/ci/build/*.rpm'
       opensuse_15_4:
         image: 'tfcollins/libiio_opensuse_15_4-ci:latest'
         artifactName: 'Linux-openSUSE-15.4'
-        build_script: ci-centos.sh
+        build_script: ci-linux.sh
+        OS_TYPE: opensuse
+        PACKAGE_TO_INSTALL: '/ci/build/*.rpm'
   steps:
   - checkout: self
     fetchDepth: 1
@@ -90,7 +100,7 @@ jobs:
       path: '$(Agent.BuildDirectory)/s/build/'
   - script: |
       set -e
-      sudo docker run --rm -t --privileged -e ARTIFACTNAME=$(artifactName) -v "$(Agent.BuildDirectory)/s":"/ci" "$(image)" /bin/bash -c "cd /ci/ && chmod +x ./CI/travis/$(build_script) && ./CI/travis/$(build_script)"
+      sudo docker run --rm -t --privileged -e ARTIFACTNAME=$(artifactName) -v "$(Agent.BuildDirectory)/s":"/ci" "$(image)" /bin/bash -c "cd /ci/ && chmod +x ./CI/travis/$(build_script) && ./CI/travis/$(build_script) $(OS_TYPE) $(PACKAGE_TO_INSTALL)"
     displayName: "Build"
   - task: CopyFiles@2
     inputs: