fix: s2i image build
@@ -107,7 +107,7 @@ jobs:
name: Collect junit reports
command: |
mkdir ./junit/
- find . -type f -regex "app/.*/target/.*-reports/.*xml" -exec cp {} ./junit/ \;
+ find . -type f -regex '.*-reports/.*xml' -exec cp {} ./junit/ \;
- store_artifacts:
path: junit
- store_artifacts:
@@ -139,7 +139,7 @@ jobs:
name: Collect junit reports
command: |
mkdir ./junit/
- find . -type f -regex "app/.*/target/.*-reports/.*xml" -exec cp {} ./junit/ \;
+ find . -type f -regex '.*-reports/.*xml' -exec cp {} ./junit/ \;
- store_artifacts:
path: junit
- store_artifacts:
@@ -169,7 +169,7 @@ jobs:
name: Collect junit reports
command: |
mkdir ./junit/
- find . -type f -regex "app/.*/target/.*-reports/.*xml" -exec cp {} ./junit/ \;
+ find . -type f -regex '.*-reports/.*xml' -exec cp {} ./junit/ \;
- store_artifacts:
path: junit
- store_artifacts:
@@ -184,6 +184,7 @@ jobs:
s2i:
<<: *job_defaults
environment:
+ DOCKER_IMAGES: syndesis-rest
<<: *common_env
steps:
- checkout
@@ -193,16 +194,10 @@ jobs:
- run:
name: Build Runtime
command: |
- ./app/build.sh --batch-mode --module s2i | tee build_log.txt | grep -v " Download"
- - run:
- name: Collect junit reports
- command: |
- mkdir ./junit/
- find . -type f -regex "app/.*/target/.*-reports/.*xml" -exec cp {} ./junit/ \;
- - store_artifacts:
- path: junit
+ ./app/build.sh --batch-mode --module s2i --image-mode docker | tee build_log.txt | grep -v " Download"
- store_artifacts:
path: build_log.txt
+ - <<: *push_images
- <<: *save_m2
- save_cache:
key: syndesis-mvn-s2i-{{ checksum "app/s2i/pom.xml" }}
@@ -224,7 +219,7 @@ jobs:
- run:
name: Build Rest
command: |
- ./app/build.sh --batch-mode --module rest --image-mode=docker | tee build_log.txt | grep -v " Download"
+ ./app/build.sh --batch-mode --module rest --image-mode docker | tee build_log.txt | grep -v " Download"
- run:
name: Collect API docs
command: |
@@ -238,7 +233,7 @@ jobs:
name: Collect junit reports
command: |
mkdir ./junit/
- find . -type f -regex "app/.*/target/.*-reports/.*xml" -exec cp {} ./junit/ \;
+ find . -type f -regex '.*-reports/.*xml' -exec cp {} ./junit/ \;
- store_artifacts:
path: junit
- store_artifacts:
