Skip to content
This repository has been archived by the owner on Jun 6, 2024. It is now read-only.

[JDK] Remove JDK version hardcode and add print in pai_build for debuging #2123

Merged
merged 8 commits into from
Feb 11, 2019
Merged

[JDK] Remove JDK version hardcode and add print in pai_build for debuging #2123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
975453b
Remove jdk version hardcode
ydye Feb 2, 2019
31dbe59
Remove jdk version hardcode
ydye Feb 2, 2019
e89c557
Remove jdk version hardcode
ydye Feb 2, 2019
6292281
Remove jdk version hardcode
ydye Feb 2, 2019
1ccdcdf
Remove jdk version hardcode
ydye Feb 2, 2019
ef22b28
Remove jdk version
ydye Feb 2, 2019
c69b183
Remove jdk version
ydye Feb 2, 2019
b1b09cb
Remove jdk version
ydye Feb 11, 2019
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: 3 additions & 5 deletions build/core/build_center.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import os
import sys
import traceback
import logging
import logging.config

Expand Down Expand Up @@ -122,8 +123,9 @@ def build_center(self):
build_worker.build_single_component(self.graph.services[item])
self.logger.info("Build all components succeed")

except:
except Exception, err:
self.logger.error("Build all components failed")
traceback.print_exc()
sys.exit(1)

finally:
Expand Down Expand Up @@ -156,7 +158,3 @@ def push_center(self):
self.docker_cli.docker_image_tag(image,self.build_config['dockerRegistryInfo']['dockerTag'])
self.docker_cli.docker_image_push(image,self.build_config['dockerRegistryInfo']['dockerTag'])
self.logger.info("Push image:{0} successfully".format(image))




1 change: 1 addition & 0 deletions deployment/k8sPaiLibrary/maintaintool/restart-etcd-server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

cp etcd-reconfiguration-restart/etcd.yaml /etc/kubernetes/manifests/

1 change: 0 additions & 1 deletion paictl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,3 @@ def main(args):

setup_logging()
main(sys.argv[1:])

4 changes: 2 additions & 2 deletions src/base-image/build/base-image.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ RUN apt-get -y update && \
python-dev \
python-pip \
python-mysqldb \
openjdk-8-jre=8u191-b12-0ubuntu0.16.04.1 \
openjdk-8-jdk=8u191-b12-0ubuntu0.16.04.1 \
openjdk-8-jre \
openjdk-8-jdk \
openssh-server \
openssh-client \
git \
Expand Down
4 changes: 2 additions & 2 deletions src/dev-box/build/dev-box.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ RUN apt-get -y update && \
python-dev \
python-pip \
python-mysqldb \
openjdk-8-jre=8u191-b12-0ubuntu0.16.04.1 \
openjdk-8-jdk=8u191-b12-0ubuntu0.16.04.1 \
openjdk-8-jre \
openjdk-8-jdk \
openssh-server \
openssh-client \
git \
Expand Down
4 changes: 2 additions & 2 deletions src/hadoop-ai/build/hadoop-ai
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ RUN apt-get -y update && \
python-dev \
python-pip \
python-mysqldb \
openjdk-8-jre=8u191-b12-0ubuntu0.16.04.1 \
openjdk-8-jdk=8u191-b12-0ubuntu0.16.04.1 \
openjdk-8-jre \
openjdk-8-jdk \
openssh-server \
openssh-client \
git \
Expand Down