Skip to content

Commit 255e6ba

Browse files
arif-alipmoravec
andcommitted
[tests] Update Foreman tests to newer version
* Use latest version of Foreman * Test using Ubuntu 22.04, Debian 12, and CentOS Stream 9 Related: #4094 Co-authored-by: Pavel Moravec <[email protected]> Signed-off-by: Arif Ali <[email protected]>
1 parent 82fc1a9 commit 255e6ba

File tree

2 files changed

+23
-27
lines changed

2 files changed

+23
-27
lines changed

.cirrus.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,13 +351,16 @@ report_foreman_task:
351351
alias: "foreman_integration"
352352
name: "Integration Test - Foreman ${FOREMAN_VER} - ${BUILD_NAME}"
353353
depends_on: stageone_report
354+
environment:
355+
FOREMAN_VER: "3.15"
356+
KATELLO_VER: "4.17"
354357
gce_instance: &bigvm
355358
<<: *standardvm
356-
type: e2-standard-2
359+
type: e2-highmem-4
357360
matrix:
358-
- env:
359-
<<: *debian-11
360-
FOREMAN_VER: "3.7"
361+
- env: *centos9
362+
- env: *debian-12
363+
- env: *ubuntuprior
361364
setup_script: *setup
362365
foreman_setup_script: ./tests/test_data/foreman_setup.sh
363366
main_script: PYTHONPATH=tests/ avocado run -p TESTLOCAL=true --max-parallel-tasks=1 -t foreman tests/product_tests/foreman/

tests/test_data/foreman_setup.sh

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,37 @@
11
#!/bin/bash
22

33
SUCCESS=0
4+
EXTRA_OPTS=""
5+
puppet_ver=8
46

57
if grep -iq centos /etc/os-release; then
6-
if [[ `echo | awk "{print ($FOREMAN_VER >= 3.4)}"` -eq 1 ]]; then
7-
dnf -y install https://yum.puppet.com/puppet7-release-el-8.noarch.rpm
8-
# workaround for https://community.theforeman.org/t/puppet-7-29-0-8-5-0-breaks-our-installer/37075
9-
# can be removed once https://github.com/puppetlabs/puppet/pull/9269 is in downstream
10-
echo "excludepkgs=puppet-agent-7.29.0*" >> /etc/yum.repos.d/puppet7-release.repo
11-
dnf -y install https://yum.theforeman.org/releases/$FOREMAN_VER/el8/x86_64/foreman-release.rpm
12-
dnf -y module enable foreman:el8
13-
else
14-
dnf -y install https://yum.puppet.com/puppet6-release-el-8.noarch.rpm
15-
dnf -y install https://yum.theforeman.org/releases/$FOREMAN_VER/el8/x86_64/foreman-release.rpm
16-
dnf -y module enable ruby:2.7 postgresql:12 foreman:el8
17-
fi
8+
os_version=$(grep VERSION_ID /etc/os-release | sed 's/VERSION_ID=\"\(.*\)\"/\1/')
9+
dnf -y install https://yum.puppet.com/puppet${puppet_ver}-release-el-${os_version}.noarch.rpm
10+
dnf -y install https://yum.theforeman.org/releases/$FOREMAN_VER/el${os_version}/x86_64/foreman-release.rpm
11+
dnf -y install https://yum.theforeman.org/katello/$KATELLO_VER/katello/el${os_version}/x86_64/katello-repos-latest.rpm
12+
dnf -y module enable foreman:el${os_version}
13+
dnf -y install foreman-installer-katello
1814
dnf -y install foreman-installer && SUCCESS=1
15+
EXTRA_OPTS="--scenario katello"
1916
elif grep -iq debian /etc/os-release; then
17+
series=$(grep VERSION_CODENAME /etc/os-release | sed s/VERSION_CODENAME=//g)
2018
apt-get update
2119
apt-get -y install ca-certificates locales
2220
sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen
2321
locale-gen
2422
export LC_ALL=en_US.UTF-8
2523
export LANG=en_US.UTF-8
26-
curl https://apt.puppet.com/puppet7-release-bullseye.deb --output /root/puppet7-release-bullseye.deb
27-
# workaround for https://community.theforeman.org/t/puppet-7-29-0-8-5-0-breaks-our-installer/37075
28-
# can be removed once https://github.com/puppetlabs/puppet/pull/9269 is in downstream
29-
cat <<< 'Package: puppet-agent
30-
Pin: version 7.29.0*
31-
Pin-Priority: -10' | sed "s/^ //g" > /etc/apt/preferences.d/puppet.pref
32-
apt-get install /root/puppet7-release-bullseye.deb
33-
curl https://archivedeb.theforeman.org/foreman.asc --output /etc/apt/trusted.gpg.d/foreman.asc
34-
echo "deb http://archivedeb.theforeman.org/ bullseye $FOREMAN_VER" | tee /etc/apt/sources.list.d/foreman.list
35-
echo "deb http://archivedeb.theforeman.org/ plugins $FOREMAN_VER" | tee -a /etc/apt/sources.list.d/foreman.list
24+
curl https://apt.puppet.com/puppet${puppet_ver}-release-${series}.deb --output /root/puppet${puppet_ver}-release-${series}.deb
25+
apt-get install /root/puppet${puppet_ver}-release-${series}.deb
26+
sudo wget https://deb.theforeman.org/foreman.asc -O /etc/apt/trusted.gpg.d/foreman.asc
27+
echo "deb http://deb.theforeman.org/ ${series} $FOREMAN_VER" | tee /etc/apt/sources.list.d/foreman.list
28+
echo "deb http://deb.theforeman.org/ plugins $FOREMAN_VER" | tee -a /etc/apt/sources.list.d/foreman.list
3629
apt-get update
3730
apt-get -y install foreman-installer && SUCCESS=1
3831
fi
3932

4033
if [[ $SUCCESS == 1 ]]; then
41-
foreman-installer --foreman-db-password='S0Sdb=p@ssw0rd!' --foreman-initial-admin-password='S0S@dmin\\p@ssw0rd!'
34+
foreman-installer --foreman-db-password='S0Sdb=p@ssw0rd!' --foreman-initial-admin-password='S0S@dmin\\p@ssw0rd!' ${EXTRA_OPTS}
4235
else
4336
echo "Setup failed"
4437
exit 1

0 commit comments

Comments
 (0)