Move engine tests to /test engine

SeldonIO · Jul 7, 2020 · 7ba7f1c · 7ba7f1c
1 parent 96cf61b
commit 7ba7f1c
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 79 deletions.
diff --git a/jenkins-x-engine.yml b/jenkins-x-engine.yml
@@ -12,6 +12,14 @@ pipelineConfig:
                   image: gcr.io/jenkinsxio/builder-go:2.0.916-264
                 dir: ci
                 sh: "./add-pr-build-comment"
+          - name: pr-build
+            steps:
+              - name: test-engine
+                command: make
+                args:
+                  - -C engine
+                  - -f Makefile
+                  - build_jar
           - name: end-to-end
             env:
               - name: SELDON_E2E_TESTS_TO_RUN

diff --git a/jenkins-x.yml b/jenkins-x.yml
@@ -2,97 +2,89 @@ buildPack: none
 pipelineConfig:
   pipelines:
     overrides:
-    - name: changelog
-      pipeline: release
-      stage: promote
-      step:
-        command: echo "skipping promote"
+      - name: changelog
+        pipeline: release
+        stage: promote
+        step:
+          command: echo "skipping promote"
     pullRequest:
       pipeline:
         agent:
           image: seldonio/core-builder:0.15
         stages:
-        - name: pr-build-comment
-          steps:
-          - agent:
-              image: gcr.io/jenkinsxio/builder-go:2.0.916-264
-            dir: ci
-            sh: "./add-pr-build-comment"
-        - name: build-and-test
-          parallel:
-          - name: test-python
-            agent:
-              image: seldonio/python-builder:0.2
+          - name: pr-build-comment
             steps:
-            - name: test-python
-              command: make
-              args:
-              - -C python
-              - update_package
-              - install_dev
-              - test
-          - name: seldon-engine
-            steps:
-            - name: test-engine
-              command: make
-              args:
-              - -C engine
-              - -f Makefile
-              - build_jar
-          - name: seldon-operator
-            steps:
-            - name: test-operator
-              command: make
-              args:
-              - -C operator
-              - test
-          - name: seldon-executor
-            steps:
-            - name: test-executor
-              command: make
-              args:
-              - -C executor
-              - test
+              - agent:
+                  image: gcr.io/jenkinsxio/builder-go:2.0.916-264
+                dir: ci
+                sh: "./add-pr-build-comment"
+          - name: build-and-test
+            parallel:
+              - name: test-python
+                agent:
+                  image: seldonio/python-builder:0.2
+                steps:
+                  - name: test-python
+                    command: make
+                    args:
+                      - -C python
+                      - update_package
+                      - install_dev
+                      - test
+              - name: seldon-operator
+                steps:
+                  - name: test-operator
+                    command: make
+                    args:
+                      - -C operator
+                      - test
+              - name: seldon-executor
+                steps:
+                  - name: test-executor
+                    command: make
+                    args:
+                      - -C executor
+                      - test
     release:
       setVersion:
         steps:
-        - name: create-version
-          command: cat version.txt > VERSION
-        - name: delete-existing-branch
-          command: git branch -D v\$(cat version.txt) || echo "No branch exists"
-        - name: create-new-branch
-          command: git checkout -b v\$(cat version.txt)
-        - name: commit-new-branch
-          command: git push origin v\$(cat version.txt) -f
-        - name: skip-tag
-          command: echo "skipping tag"
+          - name: create-version
+            command: cat version.txt > VERSION
+          - name: delete-existing-branch
+            command: git branch -D v\$(cat version.txt) || echo "No branch exists"
+          - name: create-new-branch
+            command: git checkout -b v\$(cat version.txt)
+          - name: commit-new-branch
+            command: git push origin v\$(cat version.txt) -f
+          - name: skip-tag
+            command: echo "skipping tag"
       pipeline:
         agent:
           image: seldonio/core-builder:0.15
         stages:
           - name: build-and-push
             steps:
-            - name: build-and-push-images
-              command: bash
-              args:
-              - ./ci_build_and_push_images.sh
-            - name: create-dated-version
-              command: echo $(cat version.txt)_$(date +"%Y%m%d%H%M%S") > version.txt
-            - name: create-new-branch
-              command: git checkout -b v$(cat version.txt)
-            # This is necessary as the python release.py has a known bug which hangs if the JARs are not downloaded first
-            - name: update-release-tags
-              command: (cd engine && mvn versions:set -DnewVersion=$(cat ../version.txt)) && python release.py $(cat version.txt)
-            - name: add-changes-to-branch
-              command: git add .
-            - name: commit-changes-to-branch
-              command: git commit -m "Added changes for branch"
-            - name: build-and-push-dated-images
-              command: bash
-              args:
-              - ./ci_build_and_push_images.sh
-            - name: push-new-branch
-              command: git push origin v$(cat version.txt) 
+              - name: build-and-push-images
+                command: bash
+                args:
+                  - ./ci_build_and_push_images.sh
+              - name: create-dated-version
+                command: echo $(cat version.txt)_$(date +"%Y%m%d%H%M%S") > version.txt
+              - name: create-new-branch
+                command: git checkout -b v$(cat version.txt)
+              # This is necessary as the python release.py has a known bug which hangs if the JARs are not downloaded first
+              - name: update-release-tags
+                command: (cd engine && mvn versions:set -DnewVersion=$(cat ../version.txt)) && python release.py $(cat version.txt)
+              - name: add-changes-to-branch
+                command: git add .
+              - name: commit-changes-to-branch
+                command: git commit -m "Added changes for branch"
+              - name: build-and-push-dated-images
+                command: bash
+                args:
+                  - ./ci_build_and_push_images.sh
+              - name: push-new-branch
+                command: git push origin v$(cat version.txt)
             options:
               containerOptions:
                 volumeMounts:
@@ -126,7 +118,6 @@ pipelineConfig:
                 - name: jenkins-docker-config-volume
                   secret:
                     items:
-                    - key: config.json
-                      path: config.json
+                      - key: config.json
+                        path: config.json
                     secretName: jenkins-docker-cfg
-