diff --git a/.azure-pipelines/build-sairedis-template.yml b/.azure-pipelines/build-sairedis-template.yml index 99ad4afd3..a30a39d5c 100644 --- a/.azure-pipelines/build-sairedis-template.yml +++ b/.azure-pipelines/build-sairedis-template.yml @@ -41,7 +41,6 @@ jobs: - job: displayName: ${{ parameters.arch }} timeoutInMinutes: ${{ parameters.timeout }} - pool: ${{ if ne(parameters.pool, 'default') }}: name: ${{ parameters.pool }} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6e9058811..667bb8b9e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -52,62 +52,6 @@ stages: - stage: Build jobs: - - job: - displayName: "amd64/ubuntu-20.04" - condition: false - pool: - vmImage: 'ubuntu-20.04' - - steps: - - script: | - sudo apt-get update - sudo apt-get install -y make libtool m4 autoconf dh-exec debhelper cmake pkg-config nlohmann-json3-dev \ - libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev swig3.0 \ - libpython2.7-dev libboost-dev libboost-serialization-dev uuid-dev libzmq3-dev - sudo apt-get install -y sudo - sudo apt-get install -y redis-server redis-tools - sudo apt-get install -y python3-pip - sudo pip3 install pytest - sudo apt-get install -y python - sudo apt-get install cmake libgtest-dev libgmock-dev libyang-dev - cd /usr/src/gtest && sudo cmake . && sudo make - ARCH=$(dpkg --print-architecture) - set -x - sudo curl -fsSL -o /usr/local/bin/bazel \ - https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${ARCH} - sudo chmod 755 /usr/local/bin/bazel - displayName: "Install dependencies" - - task: DownloadPipelineArtifact@2 - inputs: - source: specific - project: build - pipeline: 142 - artifact: sonic-buildimage.vs - runVersion: 'latestFromBranch' - runBranch: 'refs/heads/$(BUILD_BRANCH)' - path: $(Build.ArtifactStagingDirectory)/download - patterns: | - target/python-wheels/${{ parameters.debian_version }}/sonic_yang_mgmt-1.0-py3-none-any.whl - target/python-wheels/${{ parameters.debian_version }}/sonic_yang_models-1.0-py3-none-any.whl - displayName: "Download yang wheel from latest sonic-buildimage build" - - script: | - set -ex - sudo pip3 install ./download/target/python-wheels/${{ parameters.debian_version }}/sonic_yang_mgmt-1.0-py3-none-any.whl \ - ./download/target/python-wheels/${{ parameters.debian_version }}/sonic_yang_models-1.0-py3-none-any.whl - workingDirectory: $(Build.ArtifactStagingDirectory) - displayName: "Install yang wheel" - - script: | - ./autogen.sh - dpkg-buildpackage -us -uc -b -j$(nproc) && cp ../*.deb . - displayName: "Compile sonic swss common" - - script: | - bazel build //... - bazel test //... - displayName: "Compile and test all Bazel targets" - - publish: $(System.DefaultWorkingDirectory)/ - artifact: sonic-swss-common.amd64.ubuntu20_04 - displayName: "Archive swss common debian packages" - - job: displayName: "amd64/ubuntu-22.04" pool: @@ -189,6 +133,7 @@ stages: - template: .azure-pipelines/build-template.yml parameters: arch: amd64 + pool: sonicso1ES-amd64 sonic_slave: sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH) artifact_name: sonic-swss-common-${{ parameters.debian_version }} run_unit_test: true