From 7eece3ef9560321785603a5a2c2772846c38c20e Mon Sep 17 00:00:00 2001 From: Josh Kneubuhl Date: Tue, 15 Nov 2022 07:39:44 -0500 Subject: [PATCH] test build Signed-off-by: Josh Kneubuhl --- .github/workflows/rest-sample.yaml | 4 ++-- .github/workflows/test-network-basic.yaml | 4 ++-- .github/workflows/test-network-events.yaml | 4 ++-- .github/workflows/test-network-gateway.yaml | 4 ++-- .github/workflows/test-network-hsm.yaml | 4 ++-- .github/workflows/test-network-k8s.yaml | 4 ++-- .github/workflows/test-network-ledger.yaml | 4 ++-- .github/workflows/test-network-off-chain.yaml | 4 ++-- .github/workflows/test-network-private.yaml | 4 ++-- .github/workflows/test-network-sbe.yaml | 4 ++-- .github/workflows/test-network-secured.yaml | 4 ++-- ci/templates/install-deps-hsm.yml | 13 ------------- ci/templates/install-deps.yml | 17 ----------------- ci/templates/install-k8s-deps.yml | 9 --------- 14 files changed, 22 insertions(+), 61 deletions(-) delete mode 100644 ci/templates/install-deps-hsm.yml delete mode 100644 ci/templates/install-deps.yml delete mode 100644 ci/templates/install-k8s-deps.yml diff --git a/.github/workflows/rest-sample.yaml b/.github/workflows/rest-sample.yaml index e5184067..0fa84f0e 100644 --- a/.github/workflows/rest-sample.yaml +++ b/.github/workflows/rest-sample.yaml @@ -10,9 +10,9 @@ env: on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "foobar" ] pull_request: - branches: [ "main" ] + branches: [ "foobar" ] jobs: rest-sample: diff --git a/.github/workflows/test-network-basic.yaml b/.github/workflows/test-network-basic.yaml index 5c1cc52a..6184b923 100644 --- a/.github/workflows/test-network-basic.yaml +++ b/.github/workflows/test-network-basic.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Basic tests on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "foobar" ] pull_request: - branches: [ "main" ] + branches: [ "foobar" ] jobs: basic: diff --git a/.github/workflows/test-network-events.yaml b/.github/workflows/test-network-events.yaml index 78155e5e..9185f0eb 100644 --- a/.github/workflows/test-network-events.yaml +++ b/.github/workflows/test-network-events.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Events tests on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "foobar" ] pull_request: - branches: [ "main" ] + branches: [ "foobar" ] jobs: events: diff --git a/.github/workflows/test-network-gateway.yaml b/.github/workflows/test-network-gateway.yaml index 4f031c23..132d5bf8 100644 --- a/.github/workflows/test-network-gateway.yaml +++ b/.github/workflows/test-network-gateway.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Gateway tests on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "foobar" ] pull_request: - branches: [ "main" ] + branches: [ "foobar" ] jobs: gateway: diff --git a/.github/workflows/test-network-hsm.yaml b/.github/workflows/test-network-hsm.yaml index 9d1723cf..57d56932 100644 --- a/.github/workflows/test-network-hsm.yaml +++ b/.github/workflows/test-network-hsm.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network HSM tests on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "foobar" ] pull_request: - branches: [ "main" ] + branches: [ "foobar" ] run: hsm: diff --git a/.github/workflows/test-network-k8s.yaml b/.github/workflows/test-network-k8s.yaml index ea99078c..a85c56a5 100644 --- a/.github/workflows/test-network-k8s.yaml +++ b/.github/workflows/test-network-k8s.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is testing the Kubernetes Test Network on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "foobar" ] pull_request: - branches: [ "main" ] + branches: [ "foobar" ] jobs: ccaas-java: diff --git a/.github/workflows/test-network-ledger.yaml b/.github/workflows/test-network-ledger.yaml index 91931c8c..a5d106c7 100644 --- a/.github/workflows/test-network-ledger.yaml +++ b/.github/workflows/test-network-ledger.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Ledger tests on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "foobar" ] pull_request: - branches: [ "main" ] + branches: [ "foobar" ] jobs: basic: diff --git a/.github/workflows/test-network-off-chain.yaml b/.github/workflows/test-network-off-chain.yaml index f2e0ea6f..e36efb18 100644 --- a/.github/workflows/test-network-off-chain.yaml +++ b/.github/workflows/test-network-off-chain.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Off Chain tests on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "foobar" ] pull_request: - branches: [ "main" ] + branches: [ "foobar" ] jobs: off-chain: diff --git a/.github/workflows/test-network-private.yaml b/.github/workflows/test-network-private.yaml index 43f00957..8ce46642 100644 --- a/.github/workflows/test-network-private.yaml +++ b/.github/workflows/test-network-private.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Private tests on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "foobar" ] pull_request: - branches: [ "main" ] + branches: [ "foobar" ] jobs: private: diff --git a/.github/workflows/test-network-sbe.yaml b/.github/workflows/test-network-sbe.yaml index 37bef7a2..ec6654bd 100644 --- a/.github/workflows/test-network-sbe.yaml +++ b/.github/workflows/test-network-sbe.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network SBE tests on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "foobar" ] pull_request: - branches: [ "main" ] + branches: [ "foobar" ] jobs: SBE: diff --git a/.github/workflows/test-network-secured.yaml b/.github/workflows/test-network-secured.yaml index 2e487245..9a1eeb93 100644 --- a/.github/workflows/test-network-secured.yaml +++ b/.github/workflows/test-network-secured.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Secured tests on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "foobar" ] pull_request: - branches: [ "main" ] + branches: [ "foobar" ] jobs: secured: diff --git a/ci/templates/install-deps-hsm.yml b/ci/templates/install-deps-hsm.yml deleted file mode 100644 index f802a3eb..00000000 --- a/ci/templates/install-deps-hsm.yml +++ /dev/null @@ -1,13 +0,0 @@ -# -# SPDX-License-Identifier: Apache-2.0 -# - -steps: - - script: | - sudo apt install -y softhsm2 - displayName: Install SoftHSM - - script: | - echo directories.tokendir = /tmp > $HOME/softhsm2.conf - export SOFTHSM2_CONF=$HOME/softhsm2.conf - softhsm2-util --init-token --slot 0 --label "ForFabric" --pin 98765432 --so-pin 1234 - displayName: Set up SoftHSM \ No newline at end of file diff --git a/ci/templates/install-deps.yml b/ci/templates/install-deps.yml deleted file mode 100644 index 95729378..00000000 --- a/ci/templates/install-deps.yml +++ /dev/null @@ -1,17 +0,0 @@ -# -# SPDX-License-Identifier: Apache-2.0 -# - -steps: - - task: NodeTool@0 - inputs: - versionSpec: $(NODE_VER) - displayName: Install Node.js - - script: curl -L --retry 5 --retry-delay 3 https://hyperledger.jfrog.io/hyperledger/fabric-binaries/hyperledger-fabric-linux-amd64-${FABRIC_VERSION}-stable.tar.gz | tar xz - displayName: Download Fabric CLI - - script: curl -L --retry 5 --retry-delay 3 https://hyperledger.jfrog.io/hyperledger/fabric-binaries/hyperledger-fabric-ca-linux-amd64-${FABRIC_VERSION}-stable.tar.gz | tar xz - displayName: Download Fabric CA CLI - - script: curl https://raw.githubusercontent.com/kadwanev/retry/master/retry -o ./bin/retry && chmod +x ./bin/retry - displayName: Install retry CLI - - script: ./ci/scripts/pullFabricImages.sh - displayName: Pull Fabric Docker Imagess \ No newline at end of file diff --git a/ci/templates/install-k8s-deps.yml b/ci/templates/install-k8s-deps.yml deleted file mode 100644 index 006a2d41..00000000 --- a/ci/templates/install-k8s-deps.yml +++ /dev/null @@ -1,9 +0,0 @@ -# -# SPDX-License-Identifier: Apache-2.0 -# - -steps: - - task: NodeTool@0 - inputs: - versionSpec: $(NODE_VER) - displayName: Install Node.js