Merge branch 'master' into jenkins_2025_maintenance

Author: BraisVQ

.github/workflows/continuous-integration-workflow.yml

@@ -180,10 +180,10 @@ jobs:
         name: Checkout repository
         uses: actions/checkout@v4.2.2
       - 
-        name: Setup Go 1.18
+        name: Setup Go 1.24
         uses: actions/setup-go@v5
         with:
-          go-version: 1.18
+          go-version: 1.24
       -
         name: Verify all Go files are formatted with gofmt
         working-directory: tests
@@ -201,7 +201,7 @@ jobs:
         name: Verify all Go tests pass linting
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.49.0
+          version: v1.64.7
           working-directory: tests
           args: --timeout=10m
       -

.gitignore

@@ -21,3 +21,4 @@ output-vmware-iso
 prov-app-config.txt
 headers.txt
 response.txt
+.cache/

CHANGELOG.md

@@ -5,7 +5,10 @@
 ### Added
 
 ### Changed
- - Jenkins master and agent maintenance. Add Rhel9 variant and make it default ([#1361](https://github.com/opendevstack/ods-core/pull/1361))
+- Jenkins master and agent maintenance. Add Rhel9 variant and make it default ([#1361](https://github.com/opendevstack/ods-core/pull/1361))
+- Improved automatic tests for the quickstarters ([#1362](https://github.com/opendevstack/ods-core/pull/1362))
+- Update keystore path in import_certs.sh script ([#1365](https://github.com/opendevstack/ods-core/pull/1365))
+- Added allure plugin and command line installation to jenkins master image ([#1364](https://github.com/opendevstack/ods-core/pull/1364))
 
 ### Fixed
 

jenkins/master/Dockerfile.ubi8

@@ -18,7 +18,7 @@ USER root
 COPY yum.repos.d/ubi8.repo /etc/yum.repos.d/ubi.repo
 
 COPY ./scripts_for_usr-local-bin/* /usr/local/bin/
-RUN rpm --import https://pkg.jenkins.io/redhat-stable/jenkins.io.key \
+RUN rpm --import https://pkg.jenkins.io/rpm-stable/jenkins.io-2026.key \    
     && disable_yum_repository.sh /etc/yum.repos.d/ci-rpm-mirrors.repo \
         /etc/yum.repos.d/localdev-* /etc/yum.repos.d/epel.repo \
     && ensure_java_jre_is_adequate.sh master \

jenkins/master/configuration/init.groovy.d/allure-cli.groovy

@@ -0,0 +1,33 @@
+import jenkins.model.Jenkins
+import hudson.tools.InstallSourceProperty
+import ru.yandex.qatools.allure.jenkins.tools.AllureCommandlineInstallation
+import ru.yandex.qatools.allure.jenkins.tools.AllureCommandlineInstaller
+
+def toolName = "Allure"
+def allureVersion = "2.34.0"   
+
+def j = Jenkins.get()
+def desc = j.getDescriptorByType(AllureCommandlineInstallation.DescriptorImpl)
+
+def current = (desc.getInstallations() ?: []) as AllureCommandlineInstallation[]
+def already = current.find { it?.name == toolName }
+
+if (already) {
+  println("[init] Allure Commandline '${toolName}' already exists. Skipping.")
+  return
+}
+
+def installer = new AllureCommandlineInstaller(allureVersion)
+def prop = new InstallSourceProperty([installer])
+
+def newInst = new AllureCommandlineInstallation(
+  toolName,
+  "",          
+  [prop]
+)
+
+def updated = (current.toList() + newInst) as AllureCommandlineInstallation[]
+desc.setInstallations(updated)
+desc.save()
+
+println("[init] Allure Commandline '${toolName}' configured (version ${allureVersion})")

jenkins/master/plugins.ubi8.txt

@@ -2,6 +2,7 @@
 greenballs:1.15.1
 sonar:2.17.2
 ansicolor:1.0.4
+allure-jenkins-plugin:2.34.0
 audit-trail:361.v82cde86c784e
 Office-365-Connector:5.0.0
 mask-passwords:173.v6a_077a_291eb_5

ods-provisioning-app/docker/import_certs.sh

@@ -4,7 +4,7 @@ set -eu
 if [[ ! -z ${APP_DNS:=""} ]]; then
     echo "Setting up certificates from APP_DNS=${APP_DNS} ..."; \
 
-    KEYSTORE="$JAVA_HOME/lib/security/cacerts"
+    KEYSTORE="/opt/java/openjdk/lib/security/cacerts"
 
     arrIN=(${APP_DNS//;/ })
     for val in "${arrIN[@]}";
@@ -22,4 +22,4 @@ if [[ ! -z ${APP_DNS:=""} ]]; then
     echo "Done with certificate setup"
 else
     echo 'No certificates to import'
-fi
+fi

tests/Makefile

@@ -9,6 +9,7 @@ QS := ods-quickstarters/...
 
 ### By default we do not parallelize tests
 PARALLEL := 1
+PROJECT := unitt
 
 ## Full test of existing ODS core installation. Caution: Creates UNITT project and ODSVERIFY project.
 test: smoketest verify test-create-projects
@@ -35,12 +36,13 @@ test-create-projects:
 
 ## Run quickstarter tests within existing ODS installation. Depends on UNITT project.
 test-quickstarter:
-	@(./quickstarter-test.sh $(QS) $(PARALLEL))
+	@(./quickstarter-test.sh -p $(PROJECT) -q $(QS) -pa $(PARALLEL))
 .PHONY: test-quickstarter
 
 ## Install tools required for tests.
 prep-tools:
 	which go-junit-report || go get github.com/jstemmer/go-junit-report
+	which golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.50.0
 .PHONY: prep-tools
 
 ## Lint

tests/README.md

@@ -25,5 +25,42 @@ Run `make test` [in this directory](Makefile), which will execute project creati
 ## Running the quickstarter tests
 Run `make test-quickstarter` [in this directory](Makefile). By default, this will test all quickstarters in `ods-quickstarters` located next to `ods-core`. You can run just one specific quickstarter test with `make test-quickstarter QS=be-golang-plain` or run tests located in a custom directory like this: `make test-quickstarter QS=my-quickstarters/...` or `make test-quickstarter QS=my-quickstarters/foobar`. By default all tests run sequentially. To run some in parallel, use e.g. `make test-quickstarter PARALLEL=3`.
 
+### Keeping resources after tests
+By default, the quickstarter tests clean up all created resources (OpenShift resources, Helm releases, etc.) after each test completes. To keep the resources for debugging or inspection purposes, set the `KEEP_RESOURCES` environment variable:
+
+```bash
+KEEP_RESOURCES=true make test-quickstarter QS=be-python-flask
+```
+
+Or for the shell script:
+```bash
+KEEP_RESOURCES=true ./dev-test.sh be-python-flask e2etsqs
+```
+
+**Note:** Port-forward cleanup is handled separately and will still occur to prevent resource leaks.
+
 ## Authoring quickstarter tests
 Quickstarters must have a `testdata` directory, which needs to contain a `steps.yml` file describing which test steps to execute in YAML format. The allowed fields are defined by https://pkg.go.dev/github.com/opendevstack/ods-core/tests/quickstarter. Typically, the `testdata` directory will also contain a `golden` folder with JSON files describing the expected results. See https://github.com/opendevstack/ods-quickstarters/tree/master/be-golang-plain/testdata as an example.
+
+### Specifying namespace for OpenShift resource verification
+
+When verifying OpenShift resources, you can optionally specify a custom namespace. If not specified, the verification defaults to the `{{.ProjectID}}-dev` namespace.
+
+Example in `testdata/steps.yml`:
+
+```yaml
+- type: provision
+  provisionParams:
+    verify:
+      openShiftResources:
+        namespace: "test"  # Will check in {{.ProjectID}}-test
+        services:
+          - "{{.ComponentID}}"
+        deploymentConfigs:
+          - "{{.ComponentID}}"
+```
+
+You can also specify a full namespace (with project prefix):
+```yaml
+        namespace: "{{.ProjectID}}-cd"  # Explicit full namespace
+```

tests/create-projects/jenkinsfile_test.go

@@ -5,8 +5,9 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
+	"os"
 	"path"
 	"runtime"
 	"strings"
@@ -101,7 +102,7 @@ func TestCreateProjectThruWebhookProxyJenkinsFile(t *testing.T) {
 
 	defer reponse.Body.Close()
 
-	bodyBytes, _ := ioutil.ReadAll(reponse.Body)
+	bodyBytes, _ := io.ReadAll(reponse.Body)
 
 	if reponse.StatusCode >= http.StatusAccepted {
 		t.Fatalf("Could not post request: %s", string(bodyBytes))
@@ -154,7 +155,7 @@ func TestCreateProjectThruWebhookProxyJenkinsFile(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	expected, err := ioutil.ReadFile("golden/jenkins-create-project-stages.json")
+	expected, err := os.ReadFile("golden/jenkins-create-project-stages.json")
 	if err != nil {
 		t.Fatal(err)
 	}