Change in osmo-ci[master]: obs: make git fetch the default

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29151 ) Change subject: obs: make git fetch the default ...................................................................... obs: make git fetch the default As discussed with Neels, it makes more sense to fetch git repos by default. Change-Id: Ib8adfbcf59d66b26f322ad22b2df1ccbeaf15af7 --- M jobs/osmocom-obs.yml M scripts/obs/README M scripts/obs/lib/__init__.py 3 files changed, 4 insertions(+), 9 deletions(-) Approvals: neels: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified 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 @@ -------------------------------------- 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 @@ 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="?", -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib8adfbcf59d66b26f322ad22b2df1ccbeaf15af7 Gerrit-Change-Number: 29151 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged