Merge pull request #1964 from hunchback/release-exporters

exporters: add binary/conf to github skydive release

Author: safchain

Makefile

@@ -422,6 +422,7 @@ bench.flow: bench.flow.traces
 .PHONY: static
 static: skydive.clean govendor genlocalfiles
 	$(MAKE) compile.static WITH_LIBVIRT_GO=false
+	$(MAKE) contribs.static
 
 .PHONY: contribs.clean
 contribs.clean: contrib.exporters.clean contrib.snort.clean contrib.collectd.clean
@@ -432,6 +433,10 @@ contribs.test: contrib.exporters.test
 .PHONY: contribs
 contribs: contrib.exporters contrib.snort contrib.collectd
 
+.PHONY: contribs.static
+contribs.static:
+	$(MAKE) -C contrib/exporters static
+
 .PHONY: contrib.exporters.clean
 contrib.exporters.clean:
 	$(MAKE) -C contrib/exporters clean

contrib/exporters/Makefile

@@ -1,10 +1,13 @@
 BUILD := \
+	allinone \
+	awsflowlogs \
 	core \
+	dummy \
 	secadvisor \
-	awsflowlogs \
 	vpclogs \
-	dummy \
-	uber \
+
+STATIC := \
+	allinone \
 
 TEST := \
 	secadvisor \
@@ -20,3 +23,7 @@ clean:
 .PHONY: test
 test:
 	for i in $(TEST); do $(MAKE) -C $$i test; done
+
+.PHONY: static
+static:
+	for i in $(STATIC); do $(MAKE) -C $$i static; done

contrib/exporters/Makefile.conf

@@ -16,7 +16,7 @@ clean:
 
 .PHONY: test
 test: $(TESTS)
-	cd mod && go test
+	(cd mod 2>/dev/null && go test) || true
 
 .PHONY: run
 run: all

contrib/exporters/uber/Makefile contrib/exporters/allinone/Makefile

@@ -1,4 +1,4 @@
-PROG := uber
+PROG := allinone
 
 SRCS := \
 	main.go \

contrib/exporters/uber/uber.yml.default contrib/exporters/allinone/allinone.yml.default

@@ -37,10 +37,21 @@ git lfs install
 
 git config --global user.email "[email protected]"
 git config --global user.name "Skydive CI"
-cp ${GOPATH}/bin/skydive skydive-latest
-cp ${GOPATH}/src/github.com/skydive-project/skydive/swagger.json .
-git add skydive-latest
-git add swagger.json
+
+add() {
+    local dst=$1
+    local src=$2
+    cp $src $dst
+    git add $dst
+}
+
+allinone=$GOPATH/src/github.com/skydive-project/skydive/contrib/exporters/allinone
+
+add skydive-latest ${GOPATH}/bin/skydive
+add swagger.json ${GOPATH}/src/github.com/skydive-project/skydive/swagger.json
+add skydive-flow-exporter $allinone/allinone
+add skydive-flow-exporter.yml $allinone/allinone.yml.default
+
 git commit -m "${BUILD_TAG} Jenkins build" --amend --reset-author
 git config credential.helper "store --file=.git/credentials"
 echo "https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@github.com" > .git/credentials

contrib/exporters/uber/main.go contrib/exporters/allinone/main.go

@@ -12,6 +12,35 @@ then
     exit 1
 fi
 
+user=skydive-project
+repo=skydive
+
+cleanup() {
+    git push --delete origin $TAG || true
+    github-release delete --user $user --repo $repo --tag ${TAG} || true
+}
+
+cleanup_on_error() {
+    local retcode=$?
+    if [ $retcode != 0 ]; then
+        cleanup
+        exit $retcode
+    fi
+}
+
+release() {
+    local description="$1"
+    github-release release ${FLAGS} --user $user --repo $repo --tag ${TAG} --description "$description"
+    cleanup_on_error
+}
+
+upload() {
+    local name=$1
+    local file=$2
+    github-release upload --user $user --repo $repo --tag ${TAG} --name $name --file $file
+    cleanup_on_error
+}
+
 go get github.com/aktau/github-release
 cd ${GOPATH}/src/github.com/skydive-project/skydive
 
@@ -37,30 +66,14 @@ changelog=$(scripts/ci/extract-changelog.py CHANGELOG.md $CHANGELOG_VERSION)
 make static WITH_EBPF=true
 ${dir}/../../contrib/packaging/rpm/generate-skydive-bootstrap.sh -s -r ${TAG}
 
-github-release release ${FLAGS} --user skydive-project --repo skydive --tag ${TAG} --description "$changelog"
-retcode=$?
-if [ $retcode != 0 ]; then
-    git push --delete origin $TAG || true
-    exit $retcode
-fi
+release "$changelog"
 
-github-release upload --user skydive-project --repo skydive --tag ${TAG} --name skydive --file $GOPATH/bin/skydive
-retcode=$?
-if [ $retcode != 0 ]; then
-    git push --delete origin $TAG || true
-    github-release delete --user skydive-project --repo skydive --tag ${TAG} || true
-    exit $retcode
-fi
+allinone=$GOPATH/src/github.com/skydive-project/skydive/contrib/exporters/allinone
 
-github-release upload --user skydive-project --repo skydive --tag ${TAG} --name skydive-${VERSION}.tar.gz --file rpmbuild/SOURCES/skydive-${VERSION}.tar.gz
-retcode=$?
-if [ $retcode != 0 ]; then
-    git push --delete origin $TAG || true
-    github-release delete --user skydive-project --repo skydive --tag ${TAG} || true
-    exit $retcode
-fi
+upload skydive $GOPATH/bin/skydive
+upload skydive-${VERSION}.tar.gz rpmbuild/SOURCES/skydive-${VERSION}.tar.gz
+upload skydive-flow-exporter $allinone/allinone
 
 if [ -n "$DRY_RUN" ]; then
-    git push --delete origin $TAG || true
-    github-release delete --user skydive-project --repo skydive --tag ${TAG} || true
+    cleanup
 fi