Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move engine tests #2082

Merged
merged 2 commits into from
Jul 7, 2020
Merged

Move engine tests #2082

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ba7f1c
Move engine tests to /test engine
Jul 7, 2020
adf0623
Remove auto-formatting
Jul 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions jenkins-x-engine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
149 changes: 70 additions & 79 deletions jenkins-x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,97 +2,89 @@ buildPack: none
pipelineConfig:
pipelines:
overrides:
- name: changelog
pipeline: release
stage: promote
step:
command: echo "skipping promote"
- name: changelog
adriangonz marked this conversation as resolved.
Show resolved Hide resolved
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
adriangonz marked this conversation as resolved.
Show resolved Hide resolved
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:
Expand Down Expand Up @@ -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