From e57d2cfd529af86a575314a1ae0cdefd2250b7fd Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=B5=9C=ED=98=95=EA=B7=9C/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Senior=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Thu, 17 May 2018 10:43:09 +0900 Subject: [PATCH] Apply library function to scripts (#1244) - Apply library function to scripts Signed-off-by: Hyung-Kyu Choi --- scripts/command/docker_build_cross_arm_ubuntu.sh | 12 ++---------- .../docker_build_cross_arm_ubuntu_without_aclbuild.sh | 12 ++---------- scripts/command/docker_build_tizen_cross.sh | 8 ++------ scripts/command/docker_build_ubuntu_svace.sh | 12 ++---------- scripts/command/docker_coverage_report.sh | 12 ++---------- scripts/command/docker_cross_test_coverage_build.sh | 12 ++---------- scripts/command/docker_gbs_build.sh | 8 +++----- 7 files changed, 15 insertions(+), 61 deletions(-) diff --git a/scripts/command/docker_build_cross_arm_ubuntu.sh b/scripts/command/docker_build_cross_arm_ubuntu.sh index 5dba0c8..83e3149 100755 --- a/scripts/command/docker_build_cross_arm_ubuntu.sh +++ b/scripts/command/docker_build_cross_arm_ubuntu.sh @@ -29,15 +29,7 @@ fi docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME sh -c "$CMD" BUILD_RESULT=$? -# Newly created files during above docker run can have different ownership. -# This may cause some problems, for example, some jenkins slaves or developers -# can't remove built files due to lack of permission. -# To address this issue, let's change owner of all files -# in NNFW to owner of NNFW. -NNFW_OWNER_UID=$(stat -c "%u" $HOST_HOME) -NNFW_OWNER_GID=$(stat -c "%g" $HOST_HOME) - -CMD="chown -R $NNFW_OWNER_UID:$NNFW_OWNER_GID $DOCKER_HOME" -docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME $CMD +source $SCRIPT_ROOT/../docker_helper +restore_ownership $HOST_HOME $DOCKER_HOME exit $BUILD_RESULT diff --git a/scripts/command/docker_build_cross_arm_ubuntu_without_aclbuild.sh b/scripts/command/docker_build_cross_arm_ubuntu_without_aclbuild.sh index 92f6ff4..1269bfe 100755 --- a/scripts/command/docker_build_cross_arm_ubuntu_without_aclbuild.sh +++ b/scripts/command/docker_build_cross_arm_ubuntu_without_aclbuild.sh @@ -46,15 +46,7 @@ fi docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME sh -c "$CMD" BUILD_RESULT=$? -# Newly created files during above docker run can have different ownership. -# This may cause some problems, for example, some jenkins slaves or developers -# can't remove built files due to lack of permission. -# To address this issue, let's change owner of all files -# in NNFW to owner of NNFW. -NNFW_OWNER_UID=$(stat -c "%u" $HOST_HOME) -NNFW_OWNER_GID=$(stat -c "%g" $HOST_HOME) - -CMD="chown -R $NNFW_OWNER_UID:$NNFW_OWNER_GID $DOCKER_HOME" -docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME $CMD +source $SCRIPT_ROOT/../docker_helper +restore_ownership $HOST_HOME $DOCKER_HOME exit $BUILD_RESULT diff --git a/scripts/command/docker_build_tizen_cross.sh b/scripts/command/docker_build_tizen_cross.sh index da06369..3a45cfd 100755 --- a/scripts/command/docker_build_tizen_cross.sh +++ b/scripts/command/docker_build_tizen_cross.sh @@ -30,11 +30,7 @@ CMD="make && make install && make build_test_suite" docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME sh -c "$CMD" BUILD_RESULT=$? -# change owner of root dir and delete rootfs dir -NNFW_OWNER_UID=$(stat -c "%u" $HOST_HOME) -NNFW_OWNER_GID=$(stat -c "%g" $HOST_HOME) - -CMD="chown -R $NNFW_OWNER_UID:$NNFW_OWNER_GID $DOCKER_HOME" -docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME sh -c "$CMD" +source $SCRIPT_ROOT/../docker_helper +restore_ownership $HOST_HOME $DOCKER_HOME exit $BUILD_RESULT diff --git a/scripts/command/docker_build_ubuntu_svace.sh b/scripts/command/docker_build_ubuntu_svace.sh index 825994a..1c35de8 100755 --- a/scripts/command/docker_build_ubuntu_svace.sh +++ b/scripts/command/docker_build_ubuntu_svace.sh @@ -68,16 +68,8 @@ fi docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME sh -c "$CMD" BUILD_RESULT=$? -# Newly created files during above docker run can have different ownership. -# This may cause some problems, for example, some jenkins slaves or developers -# can't remove built files due to lack of permission. -# To address this issue, let's change owner of all files -# in NNFW to owner of NNFW. -NNFW_OWNER_UID=$(stat -c "%u" $HOST_HOME) -NNFW_OWNER_GID=$(stat -c "%g" $HOST_HOME) - -CMD="chown -R $NNFW_OWNER_UID:$NNFW_OWNER_GID $DOCKER_HOME" -docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME $CMD +source $SCRIPT_ROOT/../docker_helper +restore_ownership $HOST_HOME $DOCKER_HOME $SVACE_ANALYZER_DIR/bin/svace analyze --warning $SVACE_POLICY_FILE diff --git a/scripts/command/docker_coverage_report.sh b/scripts/command/docker_coverage_report.sh index 11836ff..c9294fe 100755 --- a/scripts/command/docker_coverage_report.sh +++ b/scripts/command/docker_coverage_report.sh @@ -17,16 +17,8 @@ docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME BUILD_RESULT=$? -# Newly created files during above docker run can have different ownership. -# This may cause some problems, for example, some jenkins slaves or developers -# can't remove built files due to lack of permission. -# To address this issue, let's change owner of all files -# in NNFW to owner of NNFW. -NNFW_OWNER_UID=$(stat -c "%u" $HOST_HOME) -NNFW_OWNER_GID=$(stat -c "%g" $HOST_HOME) - -CMD="chown -R $NNFW_OWNER_UID:$NNFW_OWNER_GID $DOCKER_HOME" -docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME $CMD +source $SCRIPT_ROOT/../docker_helper +restore_ownership $HOST_HOME $DOCKER_HOME exit $BUILD_RESULT diff --git a/scripts/command/docker_cross_test_coverage_build.sh b/scripts/command/docker_cross_test_coverage_build.sh index 0afba33..7782c75 100755 --- a/scripts/command/docker_cross_test_coverage_build.sh +++ b/scripts/command/docker_cross_test_coverage_build.sh @@ -47,15 +47,7 @@ fi docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME sh -c "$CMD" BUILD_RESULT=$? -# Newly created files during above docker run can have different ownership. -# This may cause some problems, for example, some jenkins slaves or developers -# can't remove built files due to lack of permission. -# To address this issue, let's change owner of all files -# in NNFW to owner of NNFW. -NNFW_OWNER_UID=$(stat -c "%u" $HOST_HOME) -NNFW_OWNER_GID=$(stat -c "%g" $HOST_HOME) - -CMD="chown -R $NNFW_OWNER_UID:$NNFW_OWNER_GID $DOCKER_HOME" -docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME $CMD +source $SCRIPT_ROOT/../docker_helper +restore_ownership $HOST_HOME $DOCKER_HOME exit $BUILD_RESULT diff --git a/scripts/command/docker_gbs_build.sh b/scripts/command/docker_gbs_build.sh index 6fcc2f1..dcd989e 100755 --- a/scripts/command/docker_gbs_build.sh +++ b/scripts/command/docker_gbs_build.sh @@ -31,10 +31,8 @@ CMD="gbs -c ${DOCKER_NNFW_HOME}/scripts/command/gbs.conf build -A armv7l --profi docker run $DOCKER_RUN_OPTS $DOCKER_VOLUMES ${DOCKER_ENV_VARS:-} ${DOCKER_IMAGE} sh -c "$CMD" BUILD_RESULT=$? -# change owner of root dir and delete rootfs dir -NNFW_OWNER_UID=$(stat -c "%u" $HOST_HOME) -NNFW_OWNER_GID=$(stat -c "%g" $HOST_HOME) +source $SCRIPT_ROOT/../docker_helper +restore_ownership $HOST_HOME $DOCKER_NNFW_HOME +restore_ownership $HOST_HOME $DOCKER_RPM_HOME -CMD="chown -R $NNFW_OWNER_UID:$NNFW_OWNER_GID ${DOCKER_NNFW_HOME} && chown -R $NNFW_OWNER_UID:$NNFW_OWNER_GID ${DOCKER_RPM_HOME}" -docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE sh -c "$CMD" exit $BUILD_RESULT -- 2.7.4