11package releasesources
22
33import (
4+ "fmt"
45 "testing"
56
67 "github.com/go-openapi/swag"
@@ -212,7 +213,7 @@ var _ = Describe("SyncReleaseImages", func() {
212213 It ("Should cause an error with invalid release sources - invalid cpu architecture" , func () {
213214 releaseSources := models.ReleaseSources {
214215 {
215- OpenshiftVersion : swag .String ("4.12" ),
216+ OpenshiftVersion : swag .String (common . TestVersion (). Version () ),
216217 MultiCPUArchitectures : testSupportedMultiArchitectures ,
217218 UpgradeChannels : []* models.UpgradeChannel {
218219 {
@@ -262,7 +263,7 @@ var _ = Describe("SyncReleaseImages", func() {
262263 It ("Should cause an error with invalid release sources - invalid channel" , func () {
263264 releaseSources := models.ReleaseSources {
264265 {
265- OpenshiftVersion : swag .String ("4.12" ),
266+ OpenshiftVersion : swag .String (common . TestVersion (). Version () ),
266267 MultiCPUArchitectures : testSupportedMultiArchitectures ,
267268 UpgradeChannels : []* models.UpgradeChannel {
268269 {
@@ -287,7 +288,7 @@ var _ = Describe("SyncReleaseImages", func() {
287288 It ("Should cause an error with invalid release sources - invalid multi_cpu_architectures" , func () {
288289 releaseSources := models.ReleaseSources {
289290 {
290- OpenshiftVersion : swag .String ("4.12" ),
291+ OpenshiftVersion : swag .String (common . TestVersion (). Version () ),
291292 MultiCPUArchitectures : []string {"invalid arch" },
292293 UpgradeChannels : []* models.UpgradeChannel {
293294 {
@@ -398,7 +399,7 @@ var _ = Describe("SyncReleaseImages", func() {
398399 It ("Should cause an error with invalid release sources - missing multi_cpu_architectures" , func () {
399400 releaseSources := models.ReleaseSources {
400401 {
401- OpenshiftVersion : swag .String ("4.12" ),
402+ OpenshiftVersion : swag .String (common . TestVersion (). Version () ),
402403 UpgradeChannels : []* models.UpgradeChannel {
403404 {
404405 CPUArchitecture : swag .String (common .X86CPUArchitecture ),
@@ -422,7 +423,7 @@ var _ = Describe("SyncReleaseImages", func() {
422423 It ("Should cause an error with invalid release sources - missing upgrade_channels" , func () {
423424 releaseSources := models.ReleaseSources {
424425 {
425- OpenshiftVersion : swag .String ("4.12" ),
426+ OpenshiftVersion : swag .String (common . TestVersion (). Version () ),
426427 MultiCPUArchitectures : testSupportedMultiArchitectures ,
427428 },
428429 }
@@ -441,7 +442,7 @@ var _ = Describe("SyncReleaseImages", func() {
441442 It ("Should cause an error with invalid release sources - missing cpu_architecture" , func () {
442443 releaseSources := models.ReleaseSources {
443444 {
444- OpenshiftVersion : swag .String ("4.12" ),
445+ OpenshiftVersion : swag .String (common . TestVersion (). Version () ),
445446 MultiCPUArchitectures : testSupportedMultiArchitectures ,
446447 UpgradeChannels : []* models.UpgradeChannel {
447448 {
@@ -464,7 +465,7 @@ var _ = Describe("SyncReleaseImages", func() {
464465 It ("Should cause an error with invalid release sources - missing channels" , func () {
465466 releaseSources := models.ReleaseSources {
466467 {
467- OpenshiftVersion : swag .String ("4.12" ),
468+ OpenshiftVersion : swag .String (common . TestVersion (). Version () ),
468469 MultiCPUArchitectures : testSupportedMultiArchitectures ,
469470 UpgradeChannels : []* models.UpgradeChannel {
470471 {
@@ -560,11 +561,15 @@ var _ = Describe("SyncReleaseImages", func() {
560561 })
561562
562563 It ("Should cause an error with missing required fields" , func () {
564+ testVersion := common .TestVersion ().Version ()
565+ testFullVersion := testVersion + ".1"
566+ testURL := fmt .Sprintf ("quay.io/openshift-release-dev/ocp-release:%s-x86_64" , testFullVersion )
567+
563568 releaseImages := models.ReleaseImages {
564569 {
565- Version : swag .String ("4.11.1" ),
570+ Version : swag .String (testFullVersion ),
566571 CPUArchitecture : swag .String (common .X86CPUArchitecture ),
567- URL : swag .String ("quay.io/openshift-release-dev/ocp-release:4.11.1-x86_64" ),
572+ URL : swag .String (testURL ),
568573 },
569574 }
570575 handler , err = newReleaseSourcesHandler (
@@ -579,9 +584,9 @@ var _ = Describe("SyncReleaseImages", func() {
579584
580585 releaseImages = models.ReleaseImages {
581586 {
582- OpenshiftVersion : swag .String ("4.11" ),
587+ OpenshiftVersion : swag .String (testVersion ),
583588 CPUArchitecture : swag .String (common .X86CPUArchitecture ),
584- URL : swag .String ("quay.io/openshift-release-dev/ocp-release:4.11.1-x86_64" ),
589+ URL : swag .String (testURL ),
585590 },
586591 }
587592
@@ -597,9 +602,9 @@ var _ = Describe("SyncReleaseImages", func() {
597602
598603 releaseImages = models.ReleaseImages {
599604 {
600- OpenshiftVersion : swag .String ("4.11" ),
601- Version : swag .String ("4.11.1" ),
602- URL : swag .String ("quay.io/openshift-release-dev/ocp-release:4.11.1-x86_64" ),
605+ OpenshiftVersion : swag .String (testVersion ),
606+ Version : swag .String (testFullVersion ),
607+ URL : swag .String (testURL ),
603608 },
604609 }
605610
@@ -615,8 +620,8 @@ var _ = Describe("SyncReleaseImages", func() {
615620
616621 releaseImages = models.ReleaseImages {
617622 {
618- OpenshiftVersion : swag .String ("4.11" ),
619- Version : swag .String ("4.11.1" ),
623+ OpenshiftVersion : swag .String (testVersion ),
624+ Version : swag .String (testFullVersion ),
620625 CPUArchitecture : swag .String (common .X86CPUArchitecture ),
621626 },
622627 }
@@ -663,12 +668,16 @@ var _ = Describe("SyncReleaseImages", func() {
663668 })
664669
665670 It ("Should cause an error with invalid fields" , func () {
671+ testVersion := common .TestVersion ().Version ()
672+ testFullVersion := testVersion + ".1"
673+ testURL := fmt .Sprintf ("quay.io/openshift-release-dev/ocp-release:%s-x86_64" , testFullVersion )
674+
666675 releaseImages := models.ReleaseImages {
667676 {
668- OpenshiftVersion : swag .String ("4.11" ),
669- Version : swag .String ("4.11.1" ),
677+ OpenshiftVersion : swag .String (testVersion ),
678+ Version : swag .String (testFullVersion ),
670679 CPUArchitecture : swag .String ("invalidCPUArch" ),
671- URL : swag .String ("quay.io/openshift-release-dev/ocp-release:4.11.1-x86_64" ),
680+ URL : swag .String (testURL ),
672681 },
673682 }
674683
0 commit comments