Skip to content

Commit 9f53ced

Browse files
aaradhakdustymabe
authored andcommitted
Rebuild & rename aht-dummy rpm to coreos-dummy
Resolves issues related to the dummy RPM used in kola tests (ostree.unlock, ostree.hotfix) which failed with a "no digest" error after a system rpm upgrade (to rpm 5.99.90-2.fc43). Changes in this commit: - Renamed aht-dummy.spec to coreos-dummy.spec and rebuilt the rpm. - Updated the rpm 'Name' tag within the spec file to coreos-dummy. - This addresses the outdated "aht-dummy" naming as used in Atomic Host repository which is no longer active
1 parent bf6319e commit 9f53ced

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

mantle/kola/tests/ostree/unlock.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ func init() {
4444
}
4545

4646
var (
47-
rpmUrl string = "https://raw.githubusercontent.com/projectatomic/atomic-host-tests/master/rpm/aht-dummy-1.0-1.noarch.rpm"
48-
rpmName string = "aht-dummy"
47+
rpmUrl string = "https://github.com/coreos/coreos-dummy-rpm/raw/refs/heads/main/coreos-dummy-1.0-1.noarch.rpm"
48+
rpmName string = "coreos-dummy"
4949
)
5050

5151
// ostreeAdminUnlock will unlock the deployment and verify the success of the operation

mantle/kola/tests/rpmostree/deployments.go

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,14 @@ func init() {
4949
"storage": {
5050
"files": [
5151
{
52-
"path": "/var/home/core/aht-dummy.rpm",
52+
"path": "/var/home/core/coreos-dummy.rpm",
5353
"user": {
5454
"name": "core"
55-
},
56-
"contents": {
57-
"source": "https://github.com/projectatomic/atomic-host-tests/raw/master/rpm/aht-dummy-1.0-1.noarch.rpm",
58-
"verification": {
59-
"hash": "sha512-da29ae637b30647cab2386a2ce6b4223c3ad7120ae8dd32d9ce275f26a11946400bba0b86f6feabb9fb83622856ef39f8cecf14b4975638c4d8c0cf33b0f7b26"
60-
}
61-
},
62-
"mode": 420
55+
},
56+
"contents": {
57+
"source": "https://github.com/coreos/coreos-dummy-rpm/raw/refs/heads/main/coreos-dummy-1.0-1.noarch.rpm"
58+
},
59+
"mode": 420
6360
}
6461
]
6562
}
@@ -190,9 +187,9 @@ func rpmOstreeUpgradeRollback(c cluster.TestCluster) {
190187
// This uses a dummy RPM that was originally created for the atomic-host-tests;
191188
// see: https://github.com/projectatomic/atomic-host-tests
192189
func rpmOstreeInstallUninstall(c cluster.TestCluster) {
193-
var ahtRpmPath = "/var/home/core/aht-dummy.rpm"
194-
var installPkgName = "aht-dummy-1.0-1.noarch"
195-
var installBinName = "aht-dummy"
190+
var coreosRpmPath = "/var/home/core/coreos-dummy.rpm"
191+
var installPkgName = "coreos-dummy-1.0-1.noarch"
192+
var installBinName = "coreos-dummy"
196193
var installBinPath string
197194

198195
if c.Distribution() == "fcos" {
@@ -217,7 +214,7 @@ func rpmOstreeInstallUninstall(c cluster.TestCluster) {
217214
c.Run("install", func(c cluster.TestCluster) {
218215
// install package and reboot
219216
// this is only testing local rpm install, `--cache-only` avoid fetching RPM data from remote
220-
c.RunCmdSync(m, "sudo rpm-ostree install --cache-only "+ahtRpmPath)
217+
c.RunCmdSync(m, "sudo rpm-ostree install --cache-only "+coreosRpmPath)
221218

222219
installRebootErr := m.Reboot()
223220
if installRebootErr != nil {

0 commit comments

Comments
 (0)