diff --git a/.github/workflows/build/Dockerfile.ubuntu-2204 b/.github/workflows/build/Dockerfile.ubuntu-2204 index d2cb2e6f6..68cdb9ab8 100644 --- a/.github/workflows/build/Dockerfile.ubuntu-2204 +++ b/.github/workflows/build/Dockerfile.ubuntu-2204 @@ -38,10 +38,9 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && -RUN echo "deb [trusted=yes] https://indicio.jfrog.io/artifactory/indy/ jammy dev" >> /etc/apt/sources.list && \ - echo "deb [trusted=yes] https://indicio.jfrog.io/artifactory/indy/ jammy rc" >> /etc/apt/sources.list && \ - echo "deb [trusted=yes] http://209.141.41.82:8000/ packagedir/" >> /etc/apt/sources.list - +RUN echo "deb [trusted=yes] https://indicio.jfrog.io/artifactory/indy/ jammy dev" >> /etc/apt/sources.list +RUN echo "deb [trusted=yes] https://indicio.jfrog.io/artifactory/indy-static/ jammy stable" >> /etc/apt/sources.list + RUN apt-get update -y && apt-get install -y rubygems python3-pip # && apt-get -y autoremove && rm -rf /var/lib/apt/lists/* diff --git a/.github/workflows/releasepr.yaml b/.github/workflows/releasepr.yaml index ad1666d6e..d6bd0db56 100644 --- a/.github/workflows/releasepr.yaml +++ b/.github/workflows/releasepr.yaml @@ -70,21 +70,21 @@ jobs: GITHUB_REPOSITORY_NAME: ${{ needs.release-infos.outputs.GITHUB_REPOSITORY_NAME }} UBUNTU_VERSION: ${{ needs.release-infos.outputs.UBUNTU_VERSION }} - call-indy-test-automation: - name: Indy-Test-Automation - needs: [build_packages] - uses: Indicio-tech/indy-test-automation/.github/workflows/callable_test-automation-node.yaml@v2 - with: - ubuntuVersion: "ubuntu-2004" - libIndyVersion: "1.15.0~1625-bionic" - includePaymentTests: false - testAutomationBranch: "v0.11" - debName: "indy-node*.deb" - packageName: "indy_node-deb" + # call-indy-test-automation: + # name: Indy-Test-Automation + # needs: [build_packages] + # uses: hyperledger/indy-test-automation/.github/workflows/callable_test-automation-node.yaml@v0.11 + # with: + # ubuntuVersion: "ubuntu-2004" + # libIndyVersion: "1.15.0~1625-bionic" + # includePaymentTests: false + # testAutomationBranch: "v0.11" + # debName: "indy-node*.deb" + # packageName: "indy_node-deb" statusCheck: name: statusCheck runs-on: ubuntu-latest - needs: [indy_node_tests, call-indy-test-automation] + needs: [indy_node_tests] #, call-indy-test-automation] steps: - run: 'echo "Just a status Check (Always true, when executed) for branch protection rules(blocks merging while test are running and if tests fail)." ' \ No newline at end of file diff --git a/build-scripts/ubuntu-2204/build-indy_node.sh b/build-scripts/ubuntu-2204/build-indy_node.sh index 4bc6a0b84..d589477ab 100755 --- a/build-scripts/ubuntu-2204/build-indy_node.sh +++ b/build-scripts/ubuntu-2204/build-indy_node.sh @@ -33,7 +33,9 @@ fpm --input-type "python" \ --depends iptables \ --depends libsodium23 \ --depends "indy-plenum(=${plenumDebVersion})" \ + --depends "python3-distro(=1.7.0-1)" \ --python-disable-dependency "indy-plenum" \ + --python-disable-dependency "python3-distro" \ --no-python-fix-dependencies \ --maintainer "Hyperledger " \ --before-install "preinst_node" \