Skip to content

Merge branch '1.0' into branch 'master' #115

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

Merged
merged 3 commits into from
Jan 17, 2018
Merged

Merge branch '1.0' into branch 'master' #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d0778d
Update CI containers configuration
damien-carcel Jan 16, 2018
68a9021
Merge pull request #114 from damien-carcel/jenkins
damien-carcel Jan 16, 2018
70a4401
Merge branch '1.0' into branch 'master'
damien-carcel Jan 16, 2018
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
131 changes: 0 additions & 131 deletions .ci/k8s/pim_17_ce.dev.yaml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions .ci/k8s/pim_17_ce.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
volumeMounts:
- { name: tmp-pod, mountPath: /tmp/pod, readOnly: true }
resources:
requests: {cpu: "300m", memory: "750Mi"}
requests: {cpu: "100m", memory: "700Mi"}
- name: php-api
image: akeneo/apache-php:php-PHP_API_VERSION
command: ["/bin/bash", "-c"]
Expand All @@ -63,7 +63,7 @@ spec:
- { name: docker-socket, mountPath: /var/run/docker.sock }
- { name: docker-exec, mountPath: /usr/bin/docker }
resources:
requests: {cpu: "500m", memory: "500Mi"}
requests: {cpu: "300m", memory: "300Mi"}
- name: php
image: akeneo/apache-php:php-5.6
command: ["/bin/bash", "-c"]
Expand All @@ -73,7 +73,7 @@ spec:
CHILD_PID=$!
(while true; do if [[ -f "/tmp/pod/main-terminated" ]]; then sudo kill -9 $CHILD_PID; fi; sleep 1; done) &
wait $CHILD_PID
if [[ -f "/tmp/pod/main-terminated" ]]; then exit 0; fi
if [[ -f "/tmp/pod/main-terminated" ]]; then exit 0; fi
workingDir: /home/jenkins/pim
volumeMounts:
- { name: pim, mountPath: /home/jenkins }
Expand Down
169 changes: 0 additions & 169 deletions .ci/k8s/pim_20_ce.dev.yaml
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions .ci/k8s/pim_20_ce.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
volumeMounts:
- { name: tmp-pod, mountPath: /tmp/pod, readOnly: true }
resources:
requests: {cpu: "300m", memory: "750Mi"}
requests: {cpu: "100m", memory: "700Mi"}
- name: php-api
image: akeneo/apache-php:php-PHP_API_VERSION
command: ["/bin/bash", "-c"]
Expand All @@ -63,7 +63,7 @@ spec:
- { name: docker-socket, mountPath: /var/run/docker.sock }
- { name: docker-exec, mountPath: /usr/bin/docker }
resources:
requests: {cpu: "500m", memory: "500Mi"}
requests: {cpu: "300m", memory: "300Mi"}
- name: php
image: eu.gcr.io/akeneo-ci/php:7.1-fpm
imagePullPolicy: Always
Expand Down Expand Up @@ -95,7 +95,7 @@ spec:
- { name: pim, mountPath: /home/jenkins }
- { name: tmp-pod, mountPath: /tmp/pod, readOnly: true }
resources:
requests: {cpu: "300m", memory: "300Mi"}
requests: {cpu: "100m", memory: "200Mi"}
- name: elasticsearch
image: docker.elastic.co/elasticsearch/elasticsearch:5.5.2
command: ["/bin/bash", "-c"]
Expand All @@ -111,7 +111,7 @@ spec:
volumeMounts:
- { name: tmp-pod, mountPath: /tmp/pod, readOnly: true }
resources:
requests: {cpu: "500m", memory: "1500Mi"}
requests: {cpu: "100m", memory: "1500Mi"}
readinessProbe:
httpGet:
path: /
Expand Down