diff --git a/build.py b/build.py index 3509be0282f6f79efb494118c2ab55b284b1ce99..cc9329af7ea1f0f301077515762e14d9e1a8a545 100644 --- a/build.py +++ b/build.py @@ -60,12 +60,15 @@ class Build(object): self.env["ISCI"] = "0" return True - def set_obs_project(self, obs_standard_prj, obs_epol_prj, obs_extras_prj, obs_repo_ip): + def set_obs_project(self, obs_standard_prj, obs_epol_prj, obs_extras_prj, obs_repo_ip, check_dep): """ obs_standard_prj: obs_epo_prj: obs_extras_prj: """ + cmd = "sed -i 's/checkdep=.*/checkdep=%s/g' script/setup_env.sh" % check_dep + rmsg = os.popen(cmd).read() + print(rmsg) cmd = "sed -i 's/OBS_SERVER_IP=.*/OBS_SERVER_IP=%s/g' script/setup_env.sh" % obs_repo_ip rmsg = os.popen(cmd).read() print(rmsg) @@ -178,12 +181,14 @@ if __name__ == "__main__": help="obs extras project", required=True) par.add_argument("-ip", "--obs_repo_ip", help="obs repo ip", required=True) + par.add_argument("-c", "--check_dep", default="false", + help="check rpm dependence", required=False) args = par.parse_args() build = Build() build.set_obs_project(args.obs_standard_prj, args.obs_epol_prj, args.obs_extras_prj, - args.obs_repo_ip) + args.obs_repo_ip, args.check_dep) one_step = args.step_info if one_step == "clean": ret = build.clean() diff --git a/script/setup_env.sh b/script/setup_env.sh index 1cd78ec59c854fcfb858fb37c2dabd2a5f28edee..e2f9e58fe27885c49672a92d92afb299838b2171 100644 --- a/script/setup_env.sh +++ b/script/setup_env.sh @@ -50,6 +50,8 @@ export SHA256SUM=".sha256sum" export jenkins_build="1" +export checkdep=true + OBS_REPO_CONF=$(find -iname "obs-repo.conf") cat>${OBS_REPO_CONF}< /dev/null; then yum remove oemaker -y