Skip to content

Commit bc21133

Browse files
BraisVQBraisVQ
authored
Prepare release 4.3.1 (#1263)
1 parent e0ded1a commit bc21133

File tree

8 files changed

+32
-21
lines changed

8 files changed

+32
-21
lines changed

‎.github/dependabot.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ updates:
88
schedule:
99
# Check for updates to GitHub Actions every week
1010
interval: "weekly"
11+
labels:
12+
- "dependencies"
13+
- "skip changelog"

‎.github/workflows/changelog-enforcer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
changelog:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3.5.3
11+
- uses: actions/checkout@v4.1.1
1212
- uses: dangoslen/changelog-enforcer@v3
1313
with:
1414
changeLogPath: 'CHANGELOG.md'

‎.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: Checkout repository
18-
uses: actions/checkout@v3.5.3
18+
uses: actions/checkout@v4.1.1
1919
with:
2020
# We must fetch at least the immediate parents so that if this is
2121
# a pull request then we can checkout the head.
@@ -28,14 +28,14 @@ jobs:
2828

2929
# Initializes the CodeQL tools for scanning.
3030
- name: Initialize CodeQL
31-
uses: github/codeql-action/init@v2
31+
uses: github/codeql-action/init@v3
3232
with:
3333
languages: go
3434

3535
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
3636
# If this step fails, then you should remove it and run the build manually (see below)
3737
- name: Autobuild
38-
uses: github/codeql-action/autobuild@v2
38+
uses: github/codeql-action/autobuild@v3
3939

4040
# ℹ️ Command-line programs to run using the OS shell.
4141
# 📚 https://git.io/JvXDl
@@ -49,4 +49,4 @@ jobs:
4949
# make release
5050

5151
- name: Perform CodeQL Analysis
52-
uses: github/codeql-action/analyze@v2
52+
uses: github/codeql-action/analyze@v3

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
-
1414
name: Checkout repository
15-
uses: actions/checkout@v3.5.3
15+
uses: actions/checkout@v4.1.1
1616
-
1717
name: Build UBI8 docker image
1818
run: |
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828
-
2929
name: Checkout repository
30-
uses: actions/checkout@v3.5.3
30+
uses: actions/checkout@v4.1.1
3131
- name: Build UBI8 docker image
3232
run: |
3333
./.github/workflows/build-docker-image.sh \
@@ -56,7 +56,7 @@ jobs:
5656
steps:
5757
-
5858
name: Checkout repository
59-
uses: actions/checkout@v3.5.3
59+
uses: actions/checkout@v4.1.1
6060
-
6161
name: Check shell scripts
6262
run: |
@@ -72,7 +72,7 @@ jobs:
7272
steps:
7373
-
7474
name: Checkout repository
75-
uses: actions/checkout@v3.5.3
75+
uses: actions/checkout@v4.1.1
7676
-
7777
name: Check shell scripts
7878
run: |
@@ -88,10 +88,10 @@ jobs:
8888
steps:
8989
-
9090
name: Checkout repository
91-
uses: actions/checkout@v3.5.3
91+
uses: actions/checkout@v4.1.1
9292
-
9393
name: Setup Go 1.18
94-
uses: actions/setup-go@v4
94+
uses: actions/setup-go@v5
9595
with:
9696
go-version: 1.18
9797
-
@@ -128,7 +128,7 @@ jobs:
128128
steps:
129129
-
130130
name: Checkout repository
131-
uses: actions/checkout@v3.5.3
131+
uses: actions/checkout@v4.1.1
132132
-
133133
name: Check shell scripts
134134
run: |
@@ -145,7 +145,7 @@ jobs:
145145
steps:
146146
-
147147
name: Checkout repository
148-
uses: actions/checkout@v3.5.3
148+
uses: actions/checkout@v4.1.1
149149
-
150150
name: Check jsl expectations
151151
run: |
@@ -163,10 +163,10 @@ jobs:
163163
steps:
164164
-
165165
name: Checkout repository
166-
uses: actions/checkout@v3.5.3
166+
uses: actions/checkout@v4.1.1
167167
-
168168
name: Setup Go 1.18
169-
uses: actions/setup-go@v4
169+
uses: actions/setup-go@v5
170170
with:
171171
go-version: 1.18
172172
-
@@ -184,7 +184,7 @@ jobs:
184184
exit 1
185185
-
186186
name: Verify all Go tests pass linting
187-
uses: golangci/golangci-lint-action@v3
187+
uses: golangci/golangci-lint-action@v4
188188
with:
189189
version: v1.49.0
190190
working-directory: tests
@@ -207,7 +207,7 @@ jobs:
207207
# run: jq . <<< "${GITHUB_CONTEXT}"
208208
# -
209209
# name: Checkout repository
210-
# uses: actions/checkout@v3.5.3
210+
# uses: actions/checkout@v4.1.1
211211
# with:
212212
# fetch-depth: 0
213213
# path: 'ods-core'

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
## Unreleased
44

5+
6+
## [4.3.1] - 2024-02-19
7+
8+
### Fixed
9+
- Aqua scanner and Helm deployment conflict fix for jenkins agent ([#1067](https://github.com/opendevstack/ods-jenkins-shared-library/issues/1067))
10+
- Aligned Prov-app configuration, increasing the timeouts and fixed jenkins agent image in configuration sample ([#1259](https://github.com/opendevstack/ods-core/issues/1259))
11+
512
## [4.3.0] - 2023-07-03
613

714
### Added

‎configuration-sample/ods-core.env.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ JENKINS_MASTER_DOCKERFILE_PATH=Dockerfile.ubi8
208208
# - Available tags listed at: https://catalog.redhat.com/software/containers/openshift3/jenkins-slave-base-rhel7/581d2f3f00e5d05639b6515b.
209209
# - Example: registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7:v3.11
210210
# - Latest tested tag: v3.11.248 (v3.11 is a moving target)
211-
JENKINS_AGENT_BASE_FROM_IMAGE=registry.redhat.io/openshift4/ose-jenkins:v4.10.0-202305170515.p0.g2988625.assembly.stream
211+
JENKINS_AGENT_BASE_FROM_IMAGE=registry.redhat.io/openshift4/ose-jenkins-agent-base:v4.10.0-202305170515.p0.g2988625.assembly.stream
212212

213213
# Dockerfile to use for Jenkins agents.
214214
# Use "Dockerfile.ubi8" for both OpenShift 3.11 and 4 (UBI8 base image)

‎jenkins/agent-base/Dockerfile.ubi8

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,5 +140,6 @@ RUN yum install -y skopeo \
140140
# Fix permissions.
141141
RUN mkdir -p /home/jenkins/.config && chmod -R g+w /home/jenkins/.config \
142142
&& mkdir -p /home/jenkins/.cache && chmod -R g+w /home/jenkins/.cache \
143-
&& mkdir -p /home/jenkins/.sonar && chmod -R g+w /home/jenkins/.sonar
143+
&& mkdir -p /home/jenkins/.sonar && chmod -R g+w /home/jenkins/.sonar \
144+
&& mkdir -p /tmp/aqua && chmod -R g+w /tmp/aqua
144145

‎ods-provisioning-app/ocp-config/cm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ objects:
125125
logging.file.path=${PROV_APP_LOGGING_FILE_PATH}
126126
127127
# atlassian API calls take sooo long
128-
server.servlet.session.timeout=240
128+
server.servlet.session.timeout=1200
129129
server.connection-timeout=90000
130-
spring.session.timeout=240
130+
spring.session.timeout=1200
131131
spring.mvc.async.request-timeout=90000
132132
133133
frontend.spa.enabled=${PROV_APP_FRONT_SPA_ENABLED}

0 commit comments

Comments
 (0)