ci: Update build system integration

The ci-* targets need to know where our container images are stored
and how they are called to work, so now that we use the GitLab
container registry instead of Quay some changes are necessary.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/ci/Makefile b/ci/Makefile
index bc1dac11e38976255ff69b5397e5be4061b0cf2f..a6a65bdc0f8267420081d5e5cca4568dafc474cd 100644 (file)
--- a/ci/Makefile
+++ b/ci/Makefile
@@ -50,7 +50,7 @@ CI_BUILD_SCRIPT = $(CI_ROOTDIR)/build.sh
 # Location of the container images we're going to pull
 # Can be useful to overridde to use a locally built
 # image instead
-CI_IMAGE_PREFIX = quay.io/libvirt/buildenv-libvirt-
+CI_IMAGE_PREFIX = registry.gitlab.com/libvirt/libvirt/ci-
 
 # The default tag is ':latest' but if the container
 # repo above uses different conventions this can override it
@@ -243,11 +243,11 @@ ci-list-images:
        @echo
        @echo "Available x86 container images:"
        @echo
-       @sh list-images.sh "$(CI_ENGINE)" "$(CI_IMAGE_PREFIX)" | grep -v cross
+       @sh list-images.sh "$(CI_IMAGE_PREFIX)" | grep -v cross
        @echo
        @echo "Available cross-compiler container images:"
        @echo
-       @sh list-images.sh "$(CI_ENGINE)" "$(CI_IMAGE_PREFIX)" | grep cross
+       @sh list-images.sh "$(CI_IMAGE_PREFIX)" | grep cross
        @echo
 
 ci-help:

diff --git a/ci/list-images.sh b/ci/list-images.sh
index 35efdb6982218f875142604e5935d21080c25d2c..b85b132253558f039dd0fe122da259797882dacb 100644 (file)
--- a/ci/list-images.sh
+++ b/ci/list-images.sh
@@ -1,26 +1,14 @@
 #!/bin/sh
 
-engine="$1"
-prefix="$2"
+prefix="${1##registry.gitlab.com/}"
 
-do_podman() {
-    # Podman freaks out if the search term ends with a dash, which ours
-    # by default does, so let's strip it. The repository name is the
-    # second field in the output, and it already starts with the registry
-    podman search --limit 100 "${prefix%-}" | while read _ repo _; do
-        echo "$repo"
-    done
-}
+PROJECT_ID=192693
 
-do_docker() {
-    # Docker doesn't include the registry name in the output, so we have
-    # to add it. The repository name is the first field in the output
-    registry="${prefix%%/*}"
-    docker search --limit 100 "$prefix" | while read repo _; do
-        echo "$registry/$repo"
-    done
+all_repos() {
+  curl -s "https://gitlab.com/api/v4/projects/$PROJECT_ID/registry/repositories?per_page=100" \
+    | tr , '\n' | grep '"path":' | sed 's,"path":",,g;s,"$,,g'
 }
 
-"do_$engine" | grep "^$prefix" | sed "s,^$prefix,,g" | while read repo; do
+all_repos | grep "^$prefix" | sed "s,^$prefix,,g" | while read repo; do
     echo "    $repo"
 done | sort -u