From a660b39e00a604b7d1f4d2232a064b3eee730112 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Wed, 16 Sep 2020 14:22:45 +0200 Subject: [PATCH] test/integration: use copy-cred.sh Instead of manually copying credentials around, use the new copy-creds.sh script. Also don't manually initialize kerberos, because that is now done automatically by the worker and the builder. --- test/integration.sh | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/test/integration.sh b/test/integration.sh index f5b0387..d0af646 100755 --- a/test/integration.sh +++ b/test/integration.sh @@ -53,30 +53,11 @@ sudo ./run-koji-container.sh start greenprint "Print logs" sudo podman logs org.osbuild.koji.koji -greenprint "Adding kerberos config" -sudo cp \ - /tmp/osbuild-composer-koji-test/client.keytab \ - /etc/krb5.keytab +greenprint "Copying credentials and certificates" +sudo test/copy-creds.sh -sudo cp \ - test/data/krb5.local.conf \ - /etc/krb5.conf.d/local - -greenprint "Initializing Kerberos" -kinit osbuild-krb@LOCAL -k -sudo -u _osbuild-composer kinit osbuild-krb@LOCAL -k -sudo kinit osbuild-krb@LOCAL -k - -greenprint "Adding generated CA cert" -sudo cp \ - /tmp/osbuild-composer-koji-test/ca-crt.pem \ - /etc/pki/ca-trust/source/anchors/koji-ca-crt.pem -sudo update-ca-trust - -greenprint "Testing Koji" +greenprint "Testing Koji hub API access" koji --server=http://localhost/kojihub --user=osbuild --password=osbuildpass --authtype=password hello -koji --server=http://localhost/kojihub hello -sudo -u _osbuild-composer koji --server=http://localhost/kojihub hello greenprint "Starting koji builder" sudo ./run-builder.sh start