osmith has uploaded this change for review.

View Change

scripts/common-obs: use git commit --no-verify

As I ran the scripts on my machine where I have the linter configured as
pre-commit hook, one of the "git commit" commands failed. Add
"--no-verify" to all of them to prevent this and make local testing
easier.

Change-Id: Icdb50cdd1217d848e1e640fbffd7a88b9c8bc8c6
---
M scripts/common-obs-conflict.sh
M scripts/common-obs.sh
M scripts/osmocom-latest-packages.sh
M scripts/osmocom-nightly-packages.sh
4 files changed, 7 insertions(+), 5 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/38/28638/1

diff --git a/scripts/common-obs-conflict.sh b/scripts/common-obs-conflict.sh
index 98c8b70..7603ed1 100644
--- a/scripts/common-obs-conflict.sh
+++ b/scripts/common-obs-conflict.sh
@@ -139,7 +139,7 @@
 	# Put in git repository
 	git init .
 	git add -A
-	git commit -m "auto-commit: $pkgname dummy package" || true
+	git commit -m "auto-commit: $pkgname dummy package" --no-verify || true
 	git tag -f "$OSMO_OBS_CONFLICT_PKGVER"
 
 	cd "$oldpwd"
diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh
index 6f96e95..d311663 100644
--- a/scripts/common-obs.sh
+++ b/scripts/common-obs.sh
@@ -63,7 +63,9 @@
 	# should at least have ${misc:Depends} according to lintian.
 	sed "s/^Depends: /Depends: $depend, /g" -i "$d_control"
 
-	git -C "$(dirname "$d_control")" commit -m "auto-commit: debian: depend on $depend" .
+	git -C "$(dirname "$d_control")" commit \
+		--no-verify \
+		-m "auto-commit: debian: depend on $depend" .
 }
 
 # Add dependency to all (sub)packages in rpm spec file
@@ -259,7 +261,7 @@
 		exit 1
 	fi
 	patch -p1 < "$patch"
-	git commit -m "auto-commit: apply $patch" debian/
+	git commit -m "auto-commit: apply $patch" debian/ --no-verify
 	cd ..
 }
 
diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh
index 9055f5c..179b519 100755
--- a/scripts/osmocom-latest-packages.sh
+++ b/scripts/osmocom-latest-packages.sh
@@ -110,7 +110,7 @@
     # added to the feed's branch.
     VER="$(osmo_obs_get_commit_version)"
     dch -b -v "$VER" -m "Snapshot build"
-    git commit -m "$VER snapshot" debian/
+    git commit -m "$VER snapshot" debian/ --no-verify
   fi
 
   osmo_obs_add_depend_deb "./debian/control" "$project" "osmocom-$FEED"
diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh
index 426495e..42328a3 100755
--- a/scripts/osmocom-nightly-packages.sh
+++ b/scripts/osmocom-nightly-packages.sh
@@ -126,7 +126,7 @@
     VER="$(osmo_obs_get_commit_version).$DT"
     osmo_obs_add_depend_deb "./debian/control" "$name" "osmocom-$FEED" "$dependver"
     dch -b -v "$VER" -m "Snapshot build"
-    git commit -m "$VER snapshot" debian/
+    git commit -m "$VER snapshot" debian/ --no-verify
   fi
 
   mkdir -p "$DATA/$name"

To view, visit change 28638. To unsubscribe, or for help writing mail filters, visit settings.