Commit 6cad273a authored by Michal Nowak's avatar Michal Nowak Committed by Michał Kępień

Update to CentoS 7.8, use version-specific repos

Pointing to repos in $(CENTOS_MIRROR_BASE_URL)/7/ namespace means using
always the latest CentOS 7 repos (7.8 at this point), even if the install
ISO was CentOS 7.7. A more version-specific repos should be used during
the installation.
parent 5a8a8800
......@@ -67,7 +67,7 @@ stages:
# Drop the testing repository.
- sed -i '$ d' /etc/apk/repositories
- apk add qemu-system-x86_64 qemu-img
- VERSIONS="${VERSIONS}" ISO_URL="${ISO_URL}" ISO_CHECKSUM="${ISO_CHECKSUM}" KYUA_GIT_COMMIT="$KYUA_GIT_COMMIT" make -C packer/
- VERSIONS="${VERSIONS}" RELEASE="${RELEASE}" ISO_URL="${ISO_URL}" ISO_CHECKSUM="${ISO_CHECKSUM}" KYUA_GIT_COMMIT="$KYUA_GIT_COMMIT" make -C packer/
alpine:3.11:amd64:docker:
stage: images
......@@ -146,8 +146,9 @@ centos:6:amd64:packer:
variables:
DISTROS: centos
VERSIONS: 6
RELEASE: "6.10"
ARCHS: amd64
ISO_URL: ${CENTOS_ISO_MIRROR_URL}/6.10/isos/x86_64/CentOS-6.10-x86_64-minimal.iso
ISO_URL: ${CENTOS_ISO_MIRROR_URL}/${RELEASE}/isos/x86_64/CentOS-6.10-x86_64-minimal.iso
ISO_CHECKSUM: 7c0dee2a0494dabd84809b72ddb4b761f9ef92b78a506aef709b531c54d30770
<<: *linux_amd64
<<: *kvm_image_job
......@@ -166,9 +167,10 @@ centos:7:amd64:packer:
variables:
DISTROS: centos
VERSIONS: 7
RELEASE: "7.8.2003"
ARCHS: amd64
ISO_URL: ${CENTOS_ISO_MIRROR_URL}/7.7.1908/isos/x86_64/CentOS-7-x86_64-Minimal-1908.iso
ISO_CHECKSUM: 9a2c47d97b9975452f7d582264e9fc16d108ed8252ac6816239a3b58cef5c53d
ISO_URL: ${CENTOS_ISO_MIRROR_URL}/${RELEASE}/isos/x86_64/CentOS-7-x86_64-Minimal-2003.iso
ISO_CHECKSUM: 659691c28a0e672558b003d223f83938f254b39875ee7559d1a4a14c79173193
<<: *linux_amd64
<<: *kvm_image_job
rules:
......@@ -186,8 +188,9 @@ centos:8:amd64:packer:
variables:
DISTROS: centos
VERSIONS: 8
RELEASE: "8.1.1911"
ARCHS: amd64
ISO_URL: ${CENTOS_ISO_MIRROR_URL}/8.1.1911/isos/x86_64/CentOS-8.1.1911-x86_64-boot.iso
ISO_URL: ${CENTOS_ISO_MIRROR_URL}/${RELEASE}/isos/x86_64/CentOS-8.1.1911-x86_64-boot.iso
ISO_CHECKSUM: 7fea13202bf2f26989df4175aace8fdc16e1137f7961c33512cbfad844008948
<<: *linux_amd64
<<: *kvm_image_job
......
......@@ -36,7 +36,7 @@ $(TARGETS): VERSION = $(word 2,$(subst -, ,$@))
$(TARGETS): ISO_URL ?= $($(VENDOR)_$(subst .,_,$(VERSION))_iso_url)
$(TARGETS): ISO_CHECKSUM ?= $($(VENDOR)_$(subst .,_,$(VERSION))_iso_checksum)
$(TARGETS):
BUILD_PARALLEL_JOBS="$(BUILD_PARALLEL_JOBS)" QCOW2_IMAGE="$(QCOW2_IMAGE)" make -C $(VENDOR) prepare
BUILD_PARALLEL_JOBS="$(BUILD_PARALLEL_JOBS)" QCOW2_IMAGE="$(QCOW2_IMAGE)" RELEASE="$(RELEASE)" make -C $(VENDOR) prepare
cd "$(VENDOR)/$(QCOW2_IMAGE)" && ISO_URL="$(ISO_URL)" ISO_CHECKSUM="$(ISO_CHECKSUM)" QCOW2_IMAGE="$(QCOW2_IMAGE)" packer build packer.json
sed -e 's,@QCOW2_IMAGE@,$(QCOW2_IMAGE),g' < Dockerfile.in > "$(VENDOR)/$(QCOW2_IMAGE)/output-qemu/Dockerfile"
docker build -t "$(CI_REGISTRY_IMAGE)/$(CI_REGISTRY_NAME)" "$(VENDOR)/$(QCOW2_IMAGE)/output-qemu"
......
CENTOS_MIRROR_BASE_URL ?= http://mirror.centos.org/centos/
CENTOS_MIRROR_BASE_URL ?= http://mirror.centos.org/centos
QCOW2_IMAGE ?= centos-6-x86_64
centos_6_x86_64_MIRROR_URL := $(CENTOS_MIRROR_BASE_URL)/6/os/x86_64/
centos_7_x86_64_MIRROR_URL := $(CENTOS_MIRROR_BASE_URL)/7/os/x86_64/
centos_8_x86_64_MIRROR_URL := $(CENTOS_MIRROR_BASE_URL)/8/BaseOS/x86_64/os/
centos_6_x86_64_MIRROR_URL := $(CENTOS_MIRROR_BASE_URL)/$(RELEASE)/os/x86_64/
centos_7_x86_64_MIRROR_URL := $(CENTOS_MIRROR_BASE_URL)/$(RELEASE)/os/x86_64/
centos_8_x86_64_MIRROR_URL := $(CENTOS_MIRROR_BASE_URL)/$(RELEASE)/BaseOS/x86_64/os/
.PHONY: prepare
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment