Merge pull request #19 from peaqnetwork/feat/enable_ci_on_dev_branch

fix: build rule
peaqnetwork · Jan 12, 2022 · c743776 · c743776
2 parents 7bf7cde + d069920
commit c743776
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/.lighthouse/jenkins-x/devbranch.yaml b/.lighthouse/jenkins-x/devbranch.yaml
@@ -11,12 +11,21 @@ spec:
       taskSpec:
         metadata: {}
         stepTemplate:
-          image: uses:jenkins-x/jx3-pipeline-catalog/tasks/go/release.yaml@versionStream
+          env:
+          - name: NPM_CONFIG_USERCONFIG
+            value: /tekton/home/npm/.npmrc
+          image: uses:jenkins-x/jx3-pipeline-catalog/tasks/javascript/release.yaml@versionStream
           name: ""
           resources:
             requests:
+              cpu: 0.2
+              memory: 1024Mi
+            limits:
               cpu: 400m
-              memory: 600Mi
+              memory: 2048Mi
+          volumeMounts:
+          - mountPath: /tekton/home/npm
+            name: npmrc
           workingDir: /workspace/source
         steps:
         - image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone.yaml@versionStream
@@ -26,7 +35,9 @@ spec:
           resources: {}
         - name: jx-variables
           resources: {}
-        - name: build-make-build
+        - name: build-npm-install
+          resources: {}
+        - name: build-npm-test
           resources: {}
         - name: check-registry
           resources: {}
@@ -42,7 +53,12 @@ spec:
             #!/usr/bin/env sh
             source .jx/variables.sh
             jx promote -b --timeout 1h --no-poll --env qa
+        volumes:
+        - name: npmrc
+          secret:
+            optional: true
+            secretName: npmrc
   podTemplate: {}
   serviceAccountName: tekton-bot
   timeout: 12h0m0s
-status: {}
+status: {}
diff --git a/.lighthouse/jenkins-x/release.yaml b/.lighthouse/jenkins-x/release.yaml
@@ -19,10 +19,10 @@ spec:
           resources:
             requests:
               cpu: 0.2
-              memory: 1025Mi
+              memory: 1024Mi
             limits:
               cpu: 400m
-              memory: 2049Mi
+              memory: 2048Mi
           volumeMounts:
           - mountPath: /tekton/home/npm
             name: npmrc