Merge pull request #37 from iExecBlockchainComputing/feature/clean-and-correct-part2

Clean and correct with Jenkins Lib part 2

Author: gfournierPro

CHANGELOG.md

@@ -1,7 +1,7 @@
 # Changelog
 
 ## vNEXT
-- Rewrite Jenkins CI for future migration (#36)
+- Rewrite Jenkins CI for future migration (#36, #37)
 
 ## v1.1.0 - Support deal sponsor
 - Add `sponsor` to `deal`. (#31)

Jenkinsfile_Subgraph_bellecour

@@ -3,7 +3,7 @@ WORKDIR /iexec-poco-subgraph
 COPY package*.json .
 RUN npm ci
 COPY schema.graphql .
-COPY subgraph.template.yaml .
+COPY subgraph.yaml .
 COPY networks.json .
 COPY src src
 ENTRYPOINT [ "npm", "run", "deploy:all" ]

Jenkinsfile_Subgraph_viviani

@@ -1,2 +1,2 @@
 testsFolder: test
-manifestPath: subgraph.template.yaml
+manifestPath: subgraph.yaml

config.json

@@ -5,11 +5,11 @@
   "license": "Apache-2.0",
   "scripts": {
     "prepare": "husky",
-    "codegen": "graph codegen subgraph.template.yaml",
+    "codegen": "graph codegen ",
     "test": "npm run codegen && graph test",
     "coverage": "npm run codegen && graph test -- -c",
     "test-docker": "npm run codegen && docker run -it --rm -v $(pwd):/matchstick/subgraph rainprotocol/matchstick:main",
-    "build": "npm run codegen && cp subgraph.template.yaml subgraph.yaml && graph build --network ${NETWORK_NAME:-bellecour}",
+    "build": "npm run codegen && graph build --network ${NETWORK_NAME:-bellecour}",
     "create": "graph create ${NETWORK_NAME:-bellecour}/poco --node ${GRAPHNODE_URL:-http://localhost:8020}",
     "deploy": "graph deploy ${NETWORK_NAME:-bellecour}/poco --node ${GRAPHNODE_URL:-http://localhost:8020} --ipfs ${IPFS_URL:-http://localhost:5001} --version-label ${VERSION_LABEL:-bellecour/poco-v5}",
     "deploy:all": "npm run build && npm run create && npm run deploy",