Skip to content

Commit 5480ca6

Browse files
authored
Prepare release 4.12.0 (#1371)
1 parent d8898d9 commit 5480ca6

File tree

90 files changed

+10316
-1030
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+10316
-1030
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ jobs:
180180
name: Checkout repository
181181
uses: actions/checkout@v4.1.6
182182
-
183-
name: Setup Go 1.18
183+
name: Setup Go 1.24
184184
uses: actions/setup-go@v5
185185
with:
186-
go-version: 1.18
186+
go-version: 1.24
187187
-
188188
name: Verify all Go files are formatted with gofmt
189189
working-directory: tests
@@ -201,7 +201,7 @@ jobs:
201201
name: Verify all Go tests pass linting
202202
uses: golangci/golangci-lint-action@v6
203203
with:
204-
version: v1.49.0
204+
version: v1.64.7
205205
working-directory: tests
206206
args: --timeout=10m
207207
-

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ output-vmware-iso
2121
prov-app-config.txt
2222
headers.txt
2323
response.txt
24+
.cache/

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@
88

99
### Fixed
1010

11+
## [4.12.0] - 2026-03-02
12+
### Changed
13+
- Improved automatic tests for the quickstarters ([#1362](https://github.com/opendevstack/ods-core/pull/1362))
14+
- Update keystore path in import_certs.sh script ([#1365](https://github.com/opendevstack/ods-core/pull/1365))
15+
- Added allure plugin and command line installation to jenkins master image ([#1364](https://github.com/opendevstack/ods-core/pull/1364))
16+
- Remove unnecessary configurations from ods-api-service ([#1366](https://github.com/opendevstack/ods-core/pull/1366))
17+
18+
### Fixed
19+
- Fix e2e jenkins artifacts fetch ([#1369](https://github.com/opendevstack/ods-core/pull/1369))
20+
1121
## [4.11.1] - 2025-12-05
1222

1323
### Changed

configuration-sample/ods-core.ods-api-service.env.sample

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# OpenDevStack Api Service Version
66
# See https://github.com/opendevstack/ods-api-service/releases
7-
ODS_API_SERVICE_VERSION=0.0.1
7+
ODS_API_SERVICE_VERSION=0.0.2
88

99
# JVM configuration
1010
JAVA_OPTS=-Xmx1g -Djavax.net.ssl.trustStore=/home/default/custom-truststore.jks -Djavax.net.ssl.trustStorePassword=changeit
@@ -40,36 +40,6 @@ UIPATH_QUEUE_ITEMS_ENDPOINT=/odata/QueueItems
4040

4141
# Projects Info Service
4242
PROJECTS_INFO_SERVICE_BASE_URL=https://projects-info-service.example.com
43-
AZURE_ACCESS_TOKEN=example-azure-token
44-
AZURE_DATAHUB_GROUP_ID=example-datahub-group
45-
TESTING_HUB_API_URL=https://testinghub-api.example.com/v1/projects
46-
TESTING_HUB_API_TOKEN=example-testing-hub-token
47-
TESTING_HUB_DEFAULT_PROJECTS=PROJECT1:1, PROJECT2:2
48-
49-
# OpenShift Cluster Tokens
50-
OPENSHIFT_USTEST_API_URL=https://api.us-test.example.com:6443
51-
OPENSHIFT_USTEST_TOKEN=example-ustest-token-change-me
52-
53-
OPENSHIFT_EUDEV_API_URL=https://api.eu-dev.example.com:6443
54-
OPENSHIFT_EUDEV_TOKEN=example-eudev-token-change-me
55-
56-
OPENSHIFT_USDEV_API_URL=https://api.us-dev.example.com:6443
57-
OPENSHIFT_USDEV_TOKEN=example-usdev-token-change-me
58-
59-
OPENSHIFT_CNDEV_API_URL=https://api.cn-dev.example.com:6443
60-
OPENSHIFT_CNDEV_TOKEN=example-cndev-token-change-me
61-
62-
OPENSHIFT_INHDEV_API_URL=https://api.inh-dev.example.com:6443
63-
OPENSHIFT_INHDEV_TOKEN=example-inhdev-token-change-me
64-
65-
# Bitbucket Platforms Configuration
66-
BITBUCKET_PLATFORMS_BASE_PATH=https://bitbucket.example.com/projects/PLATFORMS/repos/sections-links/raw/
67-
BITBUCKET_PLATFORMS_USTEST=us-test-sections.yml?at=main
68-
BITBUCKET_PLATFORMS_EUDEV=eu-sections.yml?at=main
69-
BITBUCKET_PLATFORMS_USDEV=us-sections.yml?at=main
70-
BITBUCKET_PLATFORMS_CNDEV=cn-sections.yml?at=main
71-
BITBUCKET_PLATFORMS_INHDEV=inh-sections.yml?at=main
72-
BITBUCKET_PLATFORMS_BEARER_TOKEN=example-bitbucket-bearer-token
7343

7444
# Project Users JWT Secret
7545
PROJECT_USERS_JWT_SECRET=example-jwt-secret-key-256bit-change-in-production

jenkins/master/Dockerfile.ubi8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ USER root
1818
COPY yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
1919

2020
COPY ./scripts_for_usr-local-bin/* /usr/local/bin/
21-
RUN rpm --import https://pkg.jenkins.io/redhat-stable/jenkins.io.key \
21+
RUN rpm --import https://pkg.jenkins.io/rpm-stable/jenkins.io-2026.key \
2222
&& disable_yum_repository.sh /etc/yum.repos.d/ci-rpm-mirrors.repo \
2323
/etc/yum.repos.d/localdev-* /etc/yum.repos.d/epel.repo \
2424
&& ensure_java_jre_is_adequate.sh master \
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import jenkins.model.Jenkins
2+
import hudson.tools.InstallSourceProperty
3+
import ru.yandex.qatools.allure.jenkins.tools.AllureCommandlineInstallation
4+
import ru.yandex.qatools.allure.jenkins.tools.AllureCommandlineInstaller
5+
6+
def toolName = "Allure"
7+
def allureVersion = "2.34.0"
8+
9+
def j = Jenkins.get()
10+
def desc = j.getDescriptorByType(AllureCommandlineInstallation.DescriptorImpl)
11+
12+
def current = (desc.getInstallations() ?: []) as AllureCommandlineInstallation[]
13+
def already = current.find { it?.name == toolName }
14+
15+
if (already) {
16+
println("[init] Allure Commandline '${toolName}' already exists. Skipping.")
17+
return
18+
}
19+
20+
def installer = new AllureCommandlineInstaller(allureVersion)
21+
def prop = new InstallSourceProperty([installer])
22+
23+
def newInst = new AllureCommandlineInstallation(
24+
toolName,
25+
"",
26+
[prop]
27+
)
28+
29+
def updated = (current.toList() + newInst) as AllureCommandlineInstallation[]
30+
desc.setInstallations(updated)
31+
desc.save()
32+
33+
println("[init] Allure Commandline '${toolName}' configured (version ${allureVersion})")

jenkins/master/plugins.ubi8.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
greenballs:1.15.1
33
sonar:2.17.2
44
ansicolor:1.0.4
5+
allure-jenkins-plugin:2.34.0
56
audit-trail:361.v82cde86c784e
67
Office-365-Connector:5.0.0
78
mask-passwords:173.v6a_077a_291eb_5

ods-api-service/chart/templates/core/deployment.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ spec:
7474
{{- if .Values.externalServices.projectsInfoService.enabled }}
7575
- configMapRef:
7676
name: {{ include "chart.fullname" . }}-projects-info-service-config
77-
- secretRef:
78-
name: {{ include "chart.fullname" . }}-projects-info-service-credentials
7977
{{- end }}
8078
{{- if gt (len .Values.externalServices.openshift.instances) 0 }}
8179
- configMapRef:

ods-api-service/chart/templates/external-service-projects-info-service/external-service-projects-info-service-configmap.yaml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,4 @@ metadata:
88
app.kubernetes.io/component: projects-info-service-config
99
data:
1010
PROJECTS_INFO_SERVICE_BASE_URL: {{ .Values.externalServices.projectsInfoService.baseUrl | quote }}
11-
PROJECTS_INFO_SERVICE_SSL_VERIFY: {{ .Values.externalServices.projectsInfoService.ssl.verifyCertificates | quote }}
12-
{{- if .Values.externalServices.projectsInfoService.ssl.trustStorePath }}
13-
PROJECTS_INFO_SERVICE_SSL_TRUSTSTORE_PATH: {{ .Values.externalServices.projectsInfoService.ssl.trustStorePath | quote }}
14-
{{- end }}
15-
{{- if .Values.externalServices.projectsInfoService.ssl.trustStoreType }}
16-
PROJECTS_INFO_SERVICE_SSL_TRUSTSTORE_TYPE: {{ .Values.externalServices.projectsInfoService.ssl.trustStoreType | quote }}
17-
{{- end }}
18-
PROJECTS_INFO_SERVICE_AZURE_DATA_HUB_GROUP_ID: {{ .Values.externalServices.projectsInfoService.azure.datahub.groupId | quote }}
19-
PROJECTS_INFO_SERVICE_AZURE_GROUPS_PAGE_SIZE: {{ .Values.externalServices.projectsInfoService.azure.groups.pageSize | quote }}
20-
PROJECTS_INFO_SERVICE_TESTING_HUB_DEFAULT_PROJECTS: {{ .Values.externalServices.projectsInfoService.testingHub.default.projects | quote }}
21-
PROJECTS_INFO_SERVICE_TESTING_HUB_API_URL: {{ .Values.externalServices.projectsInfoService.testingHub.api.url | quote }}
22-
PROJECTS_INFO_SERVICE_TESTING_HUB_API_PAGE_SIZE: {{ .Values.externalServices.projectsInfoService.testingHub.api.pageSize | quote }}
23-
PROJECTS_INFO_SERVICE_CUSTOM_CACHE_TTL_SECONDS: {{ .Values.externalServices.projectsInfoService.custom.cache.default.ttlSeconds | quote }}
24-
PROJECTS_INFO_SERVICE_CUSTOM_CACHE_MAXIMUM_SIZE: {{ .Values.externalServices.projectsInfoService.custom.cache.default.maximumSize | quote }}
25-
PROJECTS_INFO_SERVICE_CUSTOM_CACHE_FALLBACK_TTL_SECONDS: {{ .Values.externalServices.projectsInfoService.custom.cache.fallback.ttlSeconds | quote }}
26-
PROJECTS_INFO_SERVICE_CUSTOM_CACHE_FALLBACK_MAXIMUM_SIZE: {{ .Values.externalServices.projectsInfoService.custom.cache.fallback.maximumSize | quote }}
27-
PROJECTS_INFO_SERVICE_MOCK_CLUSTERS: {{ .Values.externalServices.projectsInfoService.mock.clusters | quote }}
28-
PROJECTS_INFO_SERVICE_MOCK_DEFAULT_PROJECTS: {{ .Values.externalServices.projectsInfoService.mock.projects.default | quote }}
29-
PROJECTS_INFO_SERVICE_MOCK_USER_PROJECTS: {{ .Values.externalServices.projectsInfoService.mock.projects.users | quote }}
30-
PROJECTS_INFO_SERVICE_OPENSHIFT_US_TEST_URL: {{ .Values.externalServices.projectsInfoService.openshift.api.clusters.usTest.url | quote }}
31-
PROJECTS_INFO_SERVICE_OPENSHIFT_EU_DEV_URL: {{ .Values.externalServices.projectsInfoService.openshift.api.clusters.euDev.url | quote }}
32-
PROJECTS_INFO_SERVICE_OPENSHIFT_US_DEV_URL: {{ .Values.externalServices.projectsInfoService.openshift.api.clusters.usDev.url | quote }}
33-
PROJECTS_INFO_SERVICE_OPENSHIFT_CN_DEV_URL: {{ .Values.externalServices.projectsInfoService.openshift.api.clusters.cnDev.url | quote }}
34-
PROJECTS_INFO_SERVICE_OPENSHIFT_INH_DEV_URL: {{ .Values.externalServices.projectsInfoService.openshift.api.clusters.inhDev.url | quote }}
35-
PROJECTS_INFO_SERVICE_PLATFORMS_BASE_PATH: {{ .Values.externalServices.projectsInfoService.platforms.basePath | quote }}
36-
PROJECTS_INFO_SERVICE_PLATFORMS_US_TEST_CLUSTER: {{ .Values.externalServices.projectsInfoService.platforms.clusters.usTest | quote }}
37-
PROJECTS_INFO_SERVICE_PLATFORMS_EU_CLUSTER: {{ .Values.externalServices.projectsInfoService.platforms.clusters.euDev | quote }}
38-
PROJECTS_INFO_SERVICE_PLATFORMS_US_CLUSTER: {{ .Values.externalServices.projectsInfoService.platforms.clusters.usDev | quote }}
39-
PROJECTS_INFO_SERVICE_PLATFORMS_CN_CLUSTER: {{ .Values.externalServices.projectsInfoService.platforms.clusters.cnDev | quote }}
40-
PROJECTS_INFO_SERVICE_PLATFORMS_INH_CLUSTER: {{ .Values.externalServices.projectsInfoService.platforms.clusters.inhDev | quote }}
4111
{{- end }}

ods-api-service/chart/templates/external-service-projects-info-service/external-service-projects-info-service-secret.yaml

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)