MQ V9.1.3.0 (#348)

* MQ 9.1.3 changes

* Use crtmqdir -a

* Allow generation of TLS certificate with given hostname

* Remove check for certificate env variable

* Updated manifests and changelog for 913

* Use MQ externals to configure console frame ancestors

* Create /run/mqm

* Go sec fixes

* Set SAN when generating certificates

* Remove image source and commit
This commit is contained in:
LPowlett
2019-07-24 12:01:21 +01:00
committed by GitHub
parent dc00231ec1
commit b8a7167c4e
18 changed files with 149 additions and 116 deletions

View File

@@ -1086,8 +1086,8 @@ func TestVersioning(t *testing.T) {
total := 6
foundCreated := false
foundRevision := false
foundSource := false
// foundRevision := false
// foundSource := false
foundMQVersion := false
foundMQLevel := false
foundMQLicense := false
@@ -1108,30 +1108,30 @@ func TestVersioning(t *testing.T) {
}
}
if strings.Contains(line, "Image revision:") && !foundRevision {
total--
foundRevision = true
dataAr := strings.Split(line, " ")
data := dataAr[len(dataAr)-1]
// if strings.Contains(line, "Image revision:") && !foundRevision {
// total--
// foundRevision = true
// dataAr := strings.Split(line, " ")
// data := dataAr[len(dataAr)-1]
// Verify revision
pattern := regexp.MustCompile("^[a-fA-F0-9]{40}$")
if !pattern.MatchString(data) {
t.Errorf("Failed to validate revision (%v)", data)
}
}
// // Verify revision
// pattern := regexp.MustCompile("^[a-fA-F0-9]{40}$")
// if !pattern.MatchString(data) {
// t.Errorf("Failed to validate revision (%v)", data)
// }
// }
if strings.Contains(line, "Image source:") && !foundSource {
total--
foundSource = true
dataAr := strings.Split(line, " ")
data := dataAr[len(dataAr)-1]
// if strings.Contains(line, "Image source:") && !foundSource {
// total--
// foundSource = true
// dataAr := strings.Split(line, " ")
// data := dataAr[len(dataAr)-1]
// Verify source
if !strings.Contains(data, "github") {
t.Errorf("Failed to validate source (%v)", data)
}
}
// // Verify source
// if !strings.Contains(data, "github") {
// t.Errorf("Failed to validate source (%v)", data)
// }
// }
if strings.Contains(line, "MQ version:") && !foundMQVersion {
total--
@@ -1177,7 +1177,11 @@ func TestVersioning(t *testing.T) {
}
}
if !foundCreated || !foundRevision || !foundSource || !foundMQVersion || !foundMQLevel || !foundMQLicense {
t.Errorf("Failed to find one or more version strings: created(%v) revision(%v) source(%v) mqversion(%v) mqlevel(%v) mqlicense(%v)", foundCreated, foundRevision, foundSource, foundMQVersion, foundMQLevel, foundMQLicense)
// if !foundCreated || !foundRevision || !foundSource || !foundMQVersion || !foundMQLevel || !foundMQLicense {
if !foundCreated || !foundMQVersion || !foundMQLevel || !foundMQLicense {
// t.Errorf("Failed to find one or more version strings: created(%v) revision(%v) source(%v) mqversion(%v) mqlevel(%v) mqlicense(%v)", foundCreated, foundRevision, foundSource, foundMQVersion, foundMQLevel, foundMQLicense)
t.Errorf("Failed to find one or more version strings: created(%v) mqversion(%v) mqlevel(%v) mqlicense(%v)", foundCreated, foundMQVersion, foundMQLevel, foundMQLicense)
}
}