OrgGo/Mainflux.mainflux
1
0
Fork 0
mirror of https://github.com/mainflux/mainflux.git synced 2025-04-24 13:48:49 +08:00
Code Issues Projects Releases Wiki Activity

NOISSUE - Remove installing non-existent package in ci (#758)

Browse Source 
* Remove installing non-existent  package from ci

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* remove branch master condition in ci.sh to test it

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* fix syntax error

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* update apt

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* build arm images for latest release
push ui and mqtt arm images
install only qemu-user-static

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* clean docker after pushing amd64 images

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* installing all qemu app

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* remove docker images before building ui and mqtt arm-images

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* prune dockers and test only arm build

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* fix syntax error

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* fix moving qemu-arm-static

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* installing qemu with apt-get

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* add another apt-get update

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* apt install one liner

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* testing ci script

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* After installing qemu, get appropriate version

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Test ci without amd64 dockers

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* remove tests from ci for test purpose

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Uncomment commands

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Remove whitespace and change order of building images

Signed-off-by: Ivan Milošević <iva@blokovi.com>
This commit is contained in:
Ivan Milošević 2019-06-12 21:11:45 +02:00 committed by Drasko DRASKOVIC
parent 63de955a7c
commit b53979104c
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -92,7 +92,7 @@ dockers: $(DOCKERS) docker_ui docker_mqtt
dockers_dev: $(DOCKERS_DEV)
dockers_arm: $(DOCKERS_ARM) docker_ui_arm docker_mqtt_arm
dockers_arm: $(DOCKERS_ARM) docker_arm_ui docker_arm_mqtt
ui:
$(MAKE) -C ui
@ -103,18 +103,28 @@ mqtt:
define docker_push
for svc in $(SERVICES); do \
docker push mainflux/$$svc:$(1); \
docker push mainflux/$$svc-arm32v7:$(1); \
done
docker push mainflux/ui:$(1)
docker push mainflux/mqtt:$(1)
endef
define docker_push_arm
for svc in $(SERVICES); do \
docker push mainflux/$$svc-arm32v7:$(1); \
done
docker push mainflux/ui-arm32v7:$(1)
docker push mainflux/mqtt-arm32v7:$(1)
endef
changelog:
git log $(shell git describe --tags --abbrev=0)..HEAD --pretty=format:"- %s"
latest: dockers
$(call docker_push,latest)
latest_arm: dockers_arm
$(call docker_push_arm,latest)
release:
$(eval version = $(shell git describe --abbrev=0 --tags))
git checkout $(version)

11
scripts/ci.sh
View File

@ -67,15 +67,20 @@ run_test() {
install_qemu() {
echo "Installing qemu..."
sudo apt -y install qemu-usersudo qemu qemu-user-static qemu-user binfmt-support
sudo mv /usr/bin/qemu-arm-static $MF_PATH
MF_PATH=$GOPATH/src/github.com/mainflux/mainflux
cd $MF_PATH
sudo apt-get update && sudo apt-get -y install qemu-user-static
wget https://github.com/multiarch/qemu-user-static/releases/download/v2.11.1/qemu-arm-static.tar.gz && tar -xzf qemu-arm-static.tar.gz && rm qemu-arm-static.tar.gz
sudo cp qemu-arm-static /usr/bin/
}
push() {
if test -n "$BRANCH_NAME" && test "$BRANCH_NAME" = "master"; then
echo "Pushing Docker images..."
install_qemu
make -j$NPROC latest
docker system prune -a -f
install_qemu
make latest_arm
fi
}