diff --git a/bench/app.py b/bench/app.py index c06b40f..3134170 100644 --- a/bench/app.py +++ b/bench/app.py @@ -157,7 +157,7 @@ class AppMeta: return self.get_http_url() def get_http_url(self): - return f"https://{self.remote_server}/{self.org}/{self.repo}.git" + return f"http://{self.remote_server}/{self.org}/{self.repo}.git" def get_ssh_url(self): return f"git@{self.remote_server}:{self.org}/{self.repo}.git" diff --git a/bench/utils/__init__.py b/bench/utils/__init__.py index 73202ab..7ef9a60 100644 --- a/bench/utils/__init__.py +++ b/bench/utils/__init__.py @@ -430,23 +430,27 @@ def get_env_jingrow_commands(bench_path=".") -> List: def find_org(org_repo, using_cached: bool = False): - import requests + import requests - org_repo = org_repo[0] + org_repo = org_repo[0] - for org in ["jingrow", "jerp"]: - res = requests.head(f"http://git.jingrow.com:3000/api/v1/repos/{org}/{org_repo}") - if res.status_code in (400, 403): - res = requests.head(f"http://git.jingrow.com:3000/{org}/{org_repo}") - if res.ok: - return org, org_repo + for org in ["jingrow", "jerp"]: + url = f"http://git.jingrow.com:3000/api/v1/repos/{org}/{org_repo}" + res = requests.get(url) + + if res.status_code in (400, 403): + url2 = f"http://git.jingrow.com:3000/{org}/{org_repo}" + res = requests.get(url2) + + if res.ok: + return org, org_repo - if using_cached: - return "", org_repo + if using_cached: + return "", org_repo - raise InvalidRemoteException( - f"{org_repo} not found under jingrow or jerp GitHub accounts" - ) + raise InvalidRemoteException( + f"{org_repo} not found under jingrow or jerp Git accounts" + ) def fetch_details_from_tag(