From e32043f58a2450b6a5986dc2a01f64f8b22c3992 Mon Sep 17 00:00:00 2001 From: "Yang (Gabriel) Yu" Date: Tue, 4 Sep 2018 21:02:27 +0800 Subject: Change naming and veriy test-scheduler function Changes: 1. Testing-scheduler -> Test-scheduler 2. lots of windows breaks '\r' and '^M' in files, batch changes to unix breaks '$' 3. Add ui/build Change-Id: I1f2c98ab9348460d4e68bfbfab664dae82b761ba Signed-off-by: Yang (Gabriel) Yu --- testing-scheduler/docker/plugin/Dockerfile | 24 ------------------------ testing-scheduler/docker/plugin/build.sh | 28 ---------------------------- testing-scheduler/docker/plugin/run.sh | 14 -------------- 3 files changed, 66 deletions(-) delete mode 100644 testing-scheduler/docker/plugin/Dockerfile delete mode 100644 testing-scheduler/docker/plugin/build.sh delete mode 100644 testing-scheduler/docker/plugin/run.sh (limited to 'testing-scheduler/docker/plugin') diff --git a/testing-scheduler/docker/plugin/Dockerfile b/testing-scheduler/docker/plugin/Dockerfile deleted file mode 100644 index d6297937..00000000 --- a/testing-scheduler/docker/plugin/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Huawei Technologies Co.,Ltd and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -FROM java -MAINTAINER x-lab/Leo -RUN useradd -m noroot -s /bin/bash -USER noroot -WORKDIR /home/noroot -ENV BUILD_DIR build_dir -ENV REPO_DIR ${BUILD_DIR}/conductor - -RUN mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} && \ - git clone http://github.com/Netflix/conductor.git && \ - cd conductor && git checkout v1.10.4 - -RUN cd ${REPO_DIR} && ./gradlew build - -CMD tail -f /dev/null \ No newline at end of file diff --git a/testing-scheduler/docker/plugin/build.sh b/testing-scheduler/docker/plugin/build.sh deleted file mode 100644 index cfcb98d8..00000000 --- a/testing-scheduler/docker/plugin/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Huawei Technologies Co.,Ltd and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -# get the absolute path of this shell file. -basepath=$(cd `dirname $0`; pwd) -tmppath=$basepath/tmp_files -docker_tmppath=/home/noroot/build_dir/conductor -group="x-lab" -plugin_image="$group/conductor:builder" -plugin_container="conductor-builder" -#build the gradle project in a temp container. - -mkdir -p $tmppath -docker build -t $plugin_image -f $basepath/Dockerfile $basepath -docker run -d --name $plugin_container $plugin_image -docker cp $plugin_container:$docker_tmppath $tmppath/ -docker rm -f $plugin_container -#docker rmi $plugin_image - -#build the images of conductor. -cd $tmppath/conductor/docker -docker-compose build diff --git a/testing-scheduler/docker/plugin/run.sh b/testing-scheduler/docker/plugin/run.sh deleted file mode 100644 index 8021eef5..00000000 --- a/testing-scheduler/docker/plugin/run.sh +++ /dev/null @@ -1,14 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Huawei Technologies Co.,Ltd and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -# get the absolute path of this shell file. -basepath=$(cd `dirname $0`; pwd) -tmppath=$basepath/tmp_files -cd $tmppath/conductor/docker -docker-compose -p conductor up -d \ No newline at end of file -- cgit 1.2.3-korg