wip

Signed-off-by: Yuanmao Zhu <[email protected]>
hyperledger-cello · Feb 6, 2023 · 0828679 · 0828679
1 parent 355cabb
commit 0828679
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 108 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -2,21 +2,18 @@ name: Cello CI
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 jobs:
-
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Build images
-      run: |
-        docker build . --file "build_image/docker/common/api-engine/Dockerfile.in" --tag hyperledger/cello-api-engine:$(date +%s)
-        docker build . --file "build_image/docker/common/nginx/Dockerfile.in" --tag hyperledger/cello-nginx:$(date +%s)
-        docker build . --file "build_image/docker/common/dashboard/Dockerfile.in" --tag hyperledger/cello-dashboard:$(date +%s)
-        docker build . --file "build_image/docker/agent/ansible/Dockerfile.in" --tag hyperledger/cello-ansible-agent:$(date +%s)
+      - uses: actions/checkout@v3
+      - name: Build images
+        run: |
+          docker build . --file "build_image/docker/common/api-engine/Dockerfile.in" --tag hyperledger/cello-api-engine:$(date +%s)
+          docker build . --file "build_image/docker/common/nginx/Dockerfile.in" --tag hyperledger/cello-nginx:$(date +%s)
+          docker build . --file "build_image/docker/common/dashboard/Dockerfile.in" --tag hyperledger/cello-dashboard:$(date +%s)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -4,44 +4,44 @@
 # https://aka.ms/yaml
 
 trigger:
-- main
+  - main
 
 pool:
-  vmImage: 'ubuntu-18.04'
+  vmImage: "ubuntu-18.04"
 
 variables:
   - group: credentials
 
 stages:
-- stage: PreCheck
-  displayName: Check license and documents
-  jobs:
-  - job: CheckLicenseAndDocs
-    condition: false
-    steps:
-    - template: ci/check-license-and-docs.yml
+  - stage: PreCheck
+    displayName: Check license and documents
+    jobs:
+      - job: CheckLicenseAndDocs
+        condition: false
+        steps:
+          - template: ci/check-license-and-docs.yml
 
-- stage: ProcessComponents
-  displayName: ProcessComponents
-  condition: false
-  jobs:
-  - template: ci/process-components.yml
-    parameters:
-      param:
-      - name: dashandapi
-        pretest: "dashandapi_pre.yml"
-        posttest: "dashandapi_post.yml"
-        images:
-        - imagename: "hyperledger/cello-api-engine"
-          dockerfile: "build_image/docker/common/api-engine/Dockerfile.in"
-        - imagename: "hyperledger/cello-nginx"
-          dockerfile: "build_image/docker/common/nginx/Dockerfile.in"
-        - imagename: "hyperledger/cello-dashboard"
-          dockerfile: "build_image/docker/common/dashboard/Dockerfile.in"
-      - name: ansibleagent
-        images:
-        - imagename: "hyperledger/cello-ansible-agent"
-          dockerfile: "build_image/docker/agent/ansible/Dockerfile.in"
+  - stage: ProcessComponents
+    displayName: ProcessComponents
+    condition: false
+    jobs:
+      - template: ci/process-components.yml
+        parameters:
+          param:
+            - name: dashandapi
+              pretest: "dashandapi_pre.yml"
+              posttest: "dashandapi_post.yml"
+              images:
+                - imagename: "hyperledger/cello-api-engine"
+                  dockerfile: "build_image/docker/common/api-engine/Dockerfile.in"
+                - imagename: "hyperledger/cello-nginx"
+                  dockerfile: "build_image/docker/common/nginx/Dockerfile.in"
+                - imagename: "hyperledger/cello-dashboard"
+                  dockerfile: "build_image/docker/common/dashboard/Dockerfile.in"
+          # - name: ansibleagent
+          #   images:
+          #   - imagename: "hyperledger/cello-ansible-agent"
+          #     dockerfile: "build_image/docker/agent/ansible/Dockerfile.in"
 #     - name: fabricoperator
 #       images:
 #       - imagename: "hyperledger/cello-k8s-operator-agent"

diff --git a/build_image/docker/agent/fabric-operator/Dockerfile.in b/build_image/docker/agent/fabric-operator/Dockerfile.in
diff --git a/build_image/dockerhub/latest/agent/ansible/Dockerfile b/build_image/dockerhub/latest/agent/ansible/Dockerfile
diff --git a/ci/check-component.yml b/ci/check-component.yml
@@ -7,10 +7,6 @@ steps:
       echo Checking changes in ${{ parameters.componentName }}
       dashandapi=("src/api-engine/" "src/dashboard/"
         "build_image/docker/common/")
-      ansibleagent=("src/agent/ansible/"
-        "build_image/docker/agent/ansible")
-      fabricoperator=("src/agent/fabric-operator/"
-        "build_image/docker/fabric-operator/")
 
       allchanges=$(git diff --name-only HEAD HEAD~1)
       echo 'changed files in the pull request'
@@ -40,4 +36,4 @@ steps:
         echo 'No changes found for the component'
         echo "##vso[task.setvariable variable=ContinueJob]False"
       fi
-    displayName: 'Check changes'
+    displayName: "Check changes"