drop devel

2 files changed, 33 insertions, 121 deletions

diff --git a/gitlab-ci-rpms-tito-devel.yml b/gitlab-ci-rpms-tito-devel.yml
deleted file mode 100644
index e9a6a49..0000000
--- a/gitlab-ci-rpms-tito-devel.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-tito_fedora_aarch64:
-  stage: rpms
-  image: registry.gitlab.com/kraxel/rpm-package-builder:fedora
-  tags:
-    - aarch64
-  rules:
-    - if: '$BUILD_AARCH64 == "yes"'
-  before_script:
-    - dnf builddep -y *.spec
-  script:
-    - tito build --test --rpm --output rpms-fedora-aarch64
-    - createrepo rpms-fedora-aarch64
-  artifacts:
-    paths:
-      - rpms-fedora-aarch64/
-
-tito_fedora_x86_64:
-  stage: rpms
-  image: registry.gitlab.com/kraxel/rpm-package-builder:fedora
-  before_script:
-    - dnf builddep -y *.spec
-  script:
-    - tito build --test --rpm --output rpms-fedora-x86_64
-    - createrepo rpms-fedora-x86_64
-  artifacts:
-    paths:
-      - rpms-fedora-x86_64/
-
-tito_el7_x86_64:
-  stage: rpms
-  image: registry.gitlab.com/kraxel/rpm-package-builder:el7
-  before_script:
-    - yum-builddep -y *.spec
-  script:
-    - tito build --test --rpm --output rpms-el7-x86_64
-    - createrepo rpms-el7-x86_64
-  artifacts:
-    paths:
-      - rpms-el7-x86_64/
-
-tito_el8_x86_64:
-  stage: rpms
-  image: registry.gitlab.com/kraxel/rpm-package-builder:el8
-  before_script:
-    - dnf builddep -y *.spec
-  script:
-    - tito build --test --rpm --output rpms-el8-x86_64
-    - createrepo rpms-el8-x86_64
-  artifacts:
-    paths:
-      - rpms-el8-x86_64/
-
-tito_stream8_x86_64:
-  stage: rpms
-  image: registry.gitlab.com/kraxel/rpm-package-builder:stream8
-  before_script:
-    - dnf builddep -y *.spec
-  script:
-    - tito build --test --rpm --output rpms-stream8-x86_64
-    - createrepo rpms-stream8-x86_64
-  artifacts:
-    paths:
-      - rpms-stream8-x86_64/
-
-pages:
-  stage: repo
-  image: registry.gitlab.com/kraxel/rpm-package-builder:fedora
-  script:
-    - >
-      for dir in rpms-*;
-      do
-      item="${dir#rpms-}";
-      arch="${item#*-}";
-      distro="${item%%-*}";
-      test -d "${dir}/${arch}" && mkdir -p "public/${distro}/${arch}";
-      test -d "${dir}/${arch}" && mv -v ${dir}/${arch}/*.rpm "public/${distro}/${arch}";
-      test -d "${dir}/noarch" && mkdir -p "public/${distro}/noarch";
-      test -d "${dir}/noarch" && mv -v ${dir}/noarch/*.rpm "public/${distro}/noarch";
-      mkdir -p "public/${distro}/src";
-      mv -v ${dir}/*.src.rpm "public/${distro}/src";
-      createrepo public/${distro};
-      done
-    - >
-      for dir in public/*;
-      do
-      distro="${dir#public/}";
-      name="gitlab-${CI_PROJECT_NAME}-${distro}";
-      repo="public/${name}.repo";
-      echo "[${name}]"                            >  "$repo";
-      echo "name=${name}"                         >> "$repo";
-      echo "baseurl=${CI_PAGES_URL}/${distro}/"   >> "$repo";
-      echo "skip_if_unavailable=1"                >> "$repo";
-      echo "metadata_expire=10m"                  >> "$repo";
-      echo "gpgcheck=0"                           >> "$repo";
-      done
-    - tree -T "$CI_PROJECT_NAME rpms" --dirsfirst --charset utf8 -H . public > index.html
-    - mv index.html public
-  artifacts:
-    paths:
-      - public/
diff --git a/gitlab-ci-rpms-tito.yml b/gitlab-ci-rpms-tito.yml
index 17524a5..e9a6a49 100644
--- a/gitlab-ci-rpms-tito.yml
+++ b/gitlab-ci-rpms-tito.yml
@@ -26,54 +26,66 @@ tito_fedora_x86_64:
     paths:
       - rpms-fedora-x86_64/
 
-tito_centos8_x86_64:
+tito_el7_x86_64:
   stage: rpms
-  image: registry.gitlab.com/kraxel/rpm-package-builder:centos8
+  image: registry.gitlab.com/kraxel/rpm-package-builder:el7
   before_script:
-    - dnf builddep -y *.spec
+    - yum-builddep -y *.spec
   script:
-    - tito build --test --rpm --output rpms-centos8-x86_64
-    - createrepo rpms-centos8-x86_64
+    - tito build --test --rpm --output rpms-el7-x86_64
+    - createrepo rpms-el7-x86_64
   artifacts:
     paths:
-      - rpms-centos8-x86_64/
+      - rpms-el7-x86_64/
 
-tito_centos8s_x86_64:
+tito_el8_x86_64:
   stage: rpms
-  image: registry.gitlab.com/kraxel/rpm-package-builder:centos8s
+  image: registry.gitlab.com/kraxel/rpm-package-builder:el8
   before_script:
     - dnf builddep -y *.spec
   script:
-    - tito build --test --rpm --output rpms-centos8s-x86_64
-    - createrepo rpms-centos8s-x86_64
+    - tito build --test --rpm --output rpms-el8-x86_64
+    - createrepo rpms-el8-x86_64
   artifacts:
     paths:
-      - rpms-centos8s-x86_64/
+      - rpms-el8-x86_64/
 
-tito_centos7_x86_64:
+tito_stream8_x86_64:
   stage: rpms
-  image: registry.gitlab.com/kraxel/rpm-package-builder:centos7
+  image: registry.gitlab.com/kraxel/rpm-package-builder:stream8
   before_script:
-    - yum-builddep -y *.spec
+    - dnf builddep -y *.spec
   script:
-    - tito build --test --rpm --output rpms-centos7-x86_64
-    - createrepo rpms-centos7-x86_64
+    - tito build --test --rpm --output rpms-stream8-x86_64
+    - createrepo rpms-stream8-x86_64
   artifacts:
     paths:
-      - rpms-centos7-x86_64/
+      - rpms-stream8-x86_64/
 
 pages:
   stage: repo
   image: registry.gitlab.com/kraxel/rpm-package-builder:fedora
   script:
-    - mkdir public
     - >
       for dir in rpms-*;
       do
-      distro="${dir#rpms-}";
+      item="${dir#rpms-}";
+      arch="${item#*-}";
+      distro="${item%%-*}";
+      test -d "${dir}/${arch}" && mkdir -p "public/${distro}/${arch}";
+      test -d "${dir}/${arch}" && mv -v ${dir}/${arch}/*.rpm "public/${distro}/${arch}";
+      test -d "${dir}/noarch" && mkdir -p "public/${distro}/noarch";
+      test -d "${dir}/noarch" && mv -v ${dir}/noarch/*.rpm "public/${distro}/noarch";
+      mkdir -p "public/${distro}/src";
+      mv -v ${dir}/*.src.rpm "public/${distro}/src";
+      createrepo public/${distro};
+      done
+    - >
+      for dir in public/*;
+      do
+      distro="${dir#public/}";
       name="gitlab-${CI_PROJECT_NAME}-${distro}";
       repo="public/${name}.repo";
-      mv -v $dir public/${distro};
       echo "[${name}]"                            >  "$repo";
       echo "name=${name}"                         >> "$repo";
       echo "baseurl=${CI_PAGES_URL}/${distro}/"   >> "$repo";
@@ -81,7 +93,7 @@ pages:
       echo "metadata_expire=10m"                  >> "$repo";
       echo "gpgcheck=0"                           >> "$repo";
       done
-    - tree -T "$CI_PROJECT_NAME rpms" --charset utf8 -H . public > index.html
+    - tree -T "$CI_PROJECT_NAME rpms" --dirsfirst --charset utf8 -H . public > index.html
     - mv index.html public
   artifacts:
     paths: