diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2022-08-17 16:06:36 +0200 |
|---|---|---|
| committer | osmith <osmith@sysmocom.de> | 2022-08-18 13:18:25 +0000 |
| commit | fb1f39e0c9bf2293bb68ffaa982fab6fa413d825 (patch) | |
| tree | 57f8675299312c8e9348f543629231b959786eb6 | |
| parent | 3a41a4c1b8831bc7ce7257c19bee755c651776a5 (diff) | |
obs: make git fetch the default
As discussed with Neels, it makes more sense to fetch git repos by
default.
Change-Id: Ib8adfbcf59d66b26f322ad22b2df1ccbeaf15af7
| -rw-r--r-- | jobs/osmocom-obs.yml | 1 | ||||
| -rw-r--r-- | scripts/obs/README | 6 | ||||
| -rw-r--r-- | scripts/obs/lib/__init__.py | 6 |
3 files changed, 4 insertions, 9 deletions
diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml index cb8cef1..06b4ecb 100644 --- a/jobs/osmocom-obs.yml +++ b/jobs/osmocom-obs.yml @@ -38,7 +38,6 @@ --conflict-version {conflict_version} \ --docker \ --feed {type} \ - --git-fetch \ --meta \ {proj}:{type} scm: diff --git a/scripts/obs/README b/scripts/obs/README index 6d18f7d..d9499d8 100644 --- a/scripts/obs/README +++ b/scripts/obs/README @@ -88,11 +88,7 @@ Build and upload source package to OBS -------------------------------------- cd ~/osmo-dev/src/osmo-ci/scripts/obs/ - ./update_obs_project.py -g -b origin/neels/pkg home:nhofmeyr:test osmo-hnbgw - -The -g option ensures that the latest branch tip is fetched from Osmocom's git. -Without it, the cached git repository will stay stuck on its currently checked -out branch version -- you will keep submitting the same state. + ./update_obs_project.py -b origin/neels/pkg home:nhofmeyr:test osmo-hnbgw The -b option chooses a custom branch to build. It is important to prepend 'origin/' to 'your/branch', so that repeated dev cycles use the latest branch diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index b490ae8..a07a072 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -27,9 +27,9 @@ def add_shared_arguments(parser): parser.add_argument("-d", "--docker", help="run in docker to avoid installing required pkgs", action="store_true") - parser.add_argument("-g", "--git-fetch", - help="fetch already cloned git repositories", - action="store_true") + parser.add_argument("-s", "--git-skip-fetch", + help="do not fetch already cloned git repositories", + action="store_false", dest="git_fetch") parser.add_argument("-m", "--meta", action="store_true", help="build a meta package (e.g. osmocom-nightly)") parser.add_argument("-c", "--conflict-version", nargs="?", |