start building el8 rpms

.gitlab-ci.yml

@@ -4,13 +4,13 @@ stages:
   - build
   - push
 
-build_rpm:
+.build_rpm:
   stage: build
   tags:
     - rpmbuild
-  image: $CI_REGISTRY/immerda/container-images/rpmbuild/centos:7
+  image: $CI_REGISTRY/immerda/container-images/rpmbuild/centos:${RELEASE}
   script:
-    - cp repos.el7 /etc/yum.repos.d/puppet-reqs.repo
+    - cp "repos.el${RELEASE}" /etc/yum.repos.d/puppet-reqs.repo
     - sudo -u user cp puppetserver.conf /home/user/rpmbuild/SOURCES/
     - ibuild-rpm puppet-extensions.spec
   artifacts:
@@ -19,11 +19,35 @@ build_rpm:
       - "*.rpm"
       - checksums
 
-push_rpm:
+.push_rpm:
   stage: push
   tags:
     - rpmbuild
-  image: $CI_REGISTRY/immerda/container-images/rpmbuild/centos:7
+  image: $CI_REGISTRY/immerda/container-images/rpmbuild/centos:$RELEASE
   script:
-    - ipush el7
-    - echo -e "Hi\nThere are new RPMs availabe to be signed for ${CI_PROJECT_URL}\nHave a look at the pipeline ${CI_PIPELINE_URL}\n\nChecksums:\n\n$(cat checksums)" | imail "New RPM built for ${CI_PROJECT_NAME}"
+    - ipush "el${RELEASE}"
+    - echo -e "Hi\nThere are new RPMs availabe to be signed for ${CI_PROJECT_URL} on EL${RELEASE}\nHave a look at the pipeline ${CI_PIPELINE_URL}\n\nChecksums:\n\n$(cat checksums)" | imail "New RPM built for ${CI_PROJECT_NAME}"
+
+build_el7:
+  variables:
+    RELEASE: 7
+  extends: .build_rpm
+
+build_el8:
+  variables:
+    RELEASE: 8
+  extends: .build_rpm
+
+push_el7:
+  dependencies:
+    - build_rpm_7
+  variables:
+    RELEASE: 7
+  extends: .push_rpm
+
+push_el8:
+  dependencies:
+    - build_rpm_8
+  variables:
+    RELEASE: 8
+  extends: .push_rpm

puppet-extensions.spec

 %if 0%{?_version:1}
 %define _verstr      %{_version}
 %else
-%define _verstr      0.0.15
+%define _verstr      0.0.16
 %endif
 
 # puppetserver still runs a ruby 1.9.3 kind JRuby

repos.el8

+[puppet]
+name=Puppet Repository el 8 - $basearch
+baseurl=http://yum.puppetlabs.com/puppet/el/8/x86_64
+gpgkey=http://yum.puppetlabs.com/RPM-GPG-KEY-puppet
+enabled=1
+
+[postgres96]
+name=Postgres 9.6 Repository el 8 - $basearch
+baseurl=https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-8-x86_64
+gpgkey=https://raw.githubusercontent.com/puppetlabs/puppetlabs-postgresql/master/files/RPM-GPG-KEY-PGDG
+enabled=1
+gpgcheck=1