Merge pull request #129 from stefanotorresi/revert-obs-review-changes

Revert Source full url because it's a PITA.

Author: Stefano Torresi

.ci/init_osc_creds.sh

@@ -0,0 +1,19 @@
+<services>
+    <service name="tar_scm" mode="disabled">
+        <param name="url">git://github.com/ClusterLabs/ha_cluster_exporter.git</param>
+        <param name="scm">git</param>
+        <param name="revision">%%VERSION%%</param>
+        <param name="exclude">.git</param>
+        <param name="versionformat">@PARENT_TAG@</param>
+        <param name="filename">prometheus-ha_cluster_exporter</param>
+    </service>
+    <service name="set_version" mode="disabled">
+        <param name="version">%%VERSION%%</param>
+        <param name="file">prometheus-ha_cluster_exporter.spec</param>
+    </service>
+    <service name="recompress" mode="disabled">
+        <param name="file">*.tar</param>
+        <param name="compression">gz</param>
+    </service>
+    <service name="go_modules" mode="disabled" />
+</services>

.ci/obs/_service

@@ -15,15 +15,15 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 #
 Name:           prometheus-ha_cluster_exporter
-# Version will be processed via Makefile
-Version:        %%VERSION%%
+# Version will be processed via set_version source service
+Version:        0
 Release:        0
 License:        Apache-2.0
 Summary:        Prometheus exporter for Pacemaker HA clusters metrics
 Group:          System/Monitoring
 Url:            https://github.com/ClusterLabs/ha_cluster_exporter
-# The GitHub tarball will not actually be used during build: instead, we provide a local archive with the vendored dependencies inside.
-Source:         https://github.com/ClusterLabs/ha_cluster_exporter/archive/%{version}.tar.gz
+Source:         %{name}-%{version}.tar.gz
+Source1:        vendor.tar.gz
 ExclusiveArch:  aarch64 x86_64 ppc64le s390x
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  go >= 1.11
@@ -41,7 +41,8 @@ Provides:       %{name}-devel-static = %{version}
 Prometheus exporter for Pacemaker HA clusters metrics
 
 %prep
-%setup -q -c # unpack project sources
+%setup -q            # unpack project sources
+%setup -q -T -D -a 1 # unpack go dependencies in vendor.tar.gz, which was prepared by the source services
 
 %define shortname ha_cluster_exporter
 

ha_cluster_exporter.spec …/obs/prometheus-ha_cluster_exporter.specha_cluster_exporter.spec renamed to .ci/obs/prometheus-ha_cluster_exporter.spec ha_cluster_exporter.spec renamed to .ci/obs/prometheus-ha_cluster_exporter.spec

@@ -1,2 +1 @@
 /.* export-ignore
-/ha_cluster_exporter.spec export-ignore

.gitattributes

@@ -36,4 +36,4 @@ jobs:
           docker run --rm -t -v "$(pwd):/package" -v "$GOPATH/pkg/mod:/root/go/pkg/mod" -w /package \
           -e OBS_USER -e OBS_PASS -e OBS_PROJECT -e OBS_PACKAGE -e VERSION -e REPOSITORY=$TRAVIS_REPO_SLUG \
           shap/continuous_deliver \
-          bash -c ".ci/init_osc_creds.sh && make obs-commit"
+          bash -c "/scripts/init_osc_creds.sh && make obs-commit"

.travis.yml

@@ -66,12 +66,10 @@ obs-workdir: build/obs
 build/obs:
 	@mkdir -p build/obs/$(OBS_PACKAGE)
 	osc checkout $(OBS_PROJECT)/$(OBS_PACKAGE) -o build/obs
-	cp ha_cluster_exporter.spec build/obs/$(OBS_PACKAGE).spec
-	sed -i 's/%%VERSION%%/$(VERSION)/' build/obs/$(OBS_PACKAGE).spec
-	git archive --format=tar HEAD | tar -x -C build/obs/$(OBS_PACKAGE)
-	cd build/obs/$(OBS_PACKAGE); go mod vendor
 	rm build/obs/*.tar.gz
-	tar -cvzf build/obs/$(VERSION).tar.gz -C build/obs/$(OBS_PACKAGE) .
+	cp -rv .ci/obs/* build/obs/
+	sed -i 's/%%VERSION%%/$(VERSION)/' build/obs/_service
+	cd build/obs; osc service runall
 	.ci/gh_release_to_obs_changeset.py $(REPOSITORY) -a $(AUTHOR) -t $(VERSION) -f build/obs/$(OBS_PACKAGE).changes || true
 
 obs-commit: obs-workdir