From 2d4e4d14d09c7e9fba2d86708d3b613f1495463f Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 27 Feb 2020 11:41:11 -0800 Subject: [PATCH] Add osbuild-weldr-tests to run the weldr integration tests This runs tests against a running API server, either lorax-composer or osbuild-composer, and reports the results to stdout. It uses the /run/weldr/api.socket to communicate with the server. --- Makefile | 1 + golang-github-osbuild-composer.spec | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 7d190ecb1..1b1202a30 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ build: go build -o osbuild-upload-azure ./cmd/osbuild-upload-azure/ go build -o osbuild-upload-aws ./cmd/osbuild-upload-aws/ go build -o osbuild-tests ./cmd/osbuild-tests/ + go build -o osbuild-weldr-tests ./cmd/osbuild-weldr-tests/ go build -o osbuild-dnf-json-tests ./cmd/osbuild-dnf-json-tests/ .PHONY: install diff --git a/golang-github-osbuild-composer.spec b/golang-github-osbuild-composer.spec index cc559cecc..e550344a5 100644 --- a/golang-github-osbuild-composer.spec +++ b/golang-github-osbuild-composer.spec @@ -67,6 +67,7 @@ export GOFLAGS=-mod=vendor %gobuild -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer %gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker %gobuild -o _bin/osbuild-tests %{goipath}/cmd/osbuild-tests +%gobuild -o _bin/osbuild-weldr-tests %{goipath}/cmd/osbuild-weldr-tests %gobuild -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests %gobuild -o _bin/osbuild-image-tests %{goipath}/cmd/osbuild-image-tests @@ -78,6 +79,7 @@ install -m 0755 -vp dnf-json %{buildroot}%{_libex install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer install -m 0755 -vp _bin/osbuild-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/ +install -m 0755 -vp _bin/osbuild-weldr-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/ install -m 0755 -vp _bin/osbuild-dnf-json-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/ install -m 0755 -vp _bin/osbuild-image-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/ install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer/