diff --git a/.github/dependabot.yml b/.github/dependabot.yml index dfd0e3086..a107609a1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,3 +8,6 @@ updates: schedule: # Check for updates to GitHub Actions every week interval: "weekly" + labels: + - "dependencies" + - "skip changelog" diff --git a/.github/workflows/changelog-enforcer.yml b/.github/workflows/changelog-enforcer.yml index 37dec85f8..cfa6b4fee 100644 --- a/.github/workflows/changelog-enforcer.yml +++ b/.github/workflows/changelog-enforcer.yml @@ -8,7 +8,7 @@ jobs: changelog: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.1 - uses: dangoslen/changelog-enforcer@v3 with: changeLogPath: 'CHANGELOG.md' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index faa0d81e3..9353d6792 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.1 with: # We must fetch at least the immediate parents so that if this is # a pull request then we can checkout the head. @@ -28,14 +28,14 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: go # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -49,4 +49,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index dae0eeefe..7ed91c96a 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.1 - name: Build UBI8 docker image run: | @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.1 - name: Build UBI8 docker image run: | ./.github/workflows/build-docker-image.sh \ @@ -56,7 +56,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.1 - name: Check shell scripts run: | @@ -72,7 +72,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.1 - name: Check shell scripts run: | @@ -88,10 +88,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.1 - name: Setup Go 1.18 - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.18 - @@ -128,7 +128,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.1 - name: Check shell scripts run: | @@ -145,7 +145,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.1 - name: Check jsl expectations run: | @@ -163,10 +163,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.1 - name: Setup Go 1.18 - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.18 - @@ -184,7 +184,7 @@ jobs: exit 1 - name: Verify all Go tests pass linting - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v4 with: version: v1.49.0 working-directory: tests @@ -207,7 +207,7 @@ jobs: # run: jq . <<< "${GITHUB_CONTEXT}" # - # name: Checkout repository -# uses: actions/checkout@v3.5.3 +# uses: actions/checkout@v4.1.1 # with: # fetch-depth: 0 # path: 'ods-core' diff --git a/CHANGELOG.md b/CHANGELOG.md index 318a7c796..445454ab5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## Unreleased + +## [4.3.1] - 2024-02-19 + +### Fixed +- Aqua scanner and Helm deployment conflict fix for jenkins agent ([#1067](https://github.com/opendevstack/ods-jenkins-shared-library/issues/1067)) +- Aligned Prov-app configuration, increasing the timeouts and fixed jenkins agent image in configuration sample ([#1259](https://github.com/opendevstack/ods-core/issues/1259)) + ## [4.3.0] - 2023-07-03 ### Added diff --git a/configuration-sample/ods-core.env.sample b/configuration-sample/ods-core.env.sample index 483749911..9938688db 100644 --- a/configuration-sample/ods-core.env.sample +++ b/configuration-sample/ods-core.env.sample @@ -208,7 +208,7 @@ JENKINS_MASTER_DOCKERFILE_PATH=Dockerfile.ubi8 # - Available tags listed at: https://catalog.redhat.com/software/containers/openshift3/jenkins-slave-base-rhel7/581d2f3f00e5d05639b6515b. # - Example: registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7:v3.11 # - Latest tested tag: v3.11.248 (v3.11 is a moving target) -JENKINS_AGENT_BASE_FROM_IMAGE=registry.redhat.io/openshift4/ose-jenkins:v4.10.0-202305170515.p0.g2988625.assembly.stream +JENKINS_AGENT_BASE_FROM_IMAGE=registry.redhat.io/openshift4/ose-jenkins-agent-base:v4.10.0-202305170515.p0.g2988625.assembly.stream # Dockerfile to use for Jenkins agents. # Use "Dockerfile.ubi8" for both OpenShift 3.11 and 4 (UBI8 base image) diff --git a/jenkins/agent-base/Dockerfile.ubi8 b/jenkins/agent-base/Dockerfile.ubi8 index 8fe9ad664..3ad35394c 100644 --- a/jenkins/agent-base/Dockerfile.ubi8 +++ b/jenkins/agent-base/Dockerfile.ubi8 @@ -140,5 +140,6 @@ RUN yum install -y skopeo \ # Fix permissions. RUN mkdir -p /home/jenkins/.config && chmod -R g+w /home/jenkins/.config \ && mkdir -p /home/jenkins/.cache && chmod -R g+w /home/jenkins/.cache \ - && mkdir -p /home/jenkins/.sonar && chmod -R g+w /home/jenkins/.sonar + && mkdir -p /home/jenkins/.sonar && chmod -R g+w /home/jenkins/.sonar \ + && mkdir -p /tmp/aqua && chmod -R g+w /tmp/aqua diff --git a/ods-provisioning-app/ocp-config/cm.yml b/ods-provisioning-app/ocp-config/cm.yml index cdcf4bb7c..830e2a885 100644 --- a/ods-provisioning-app/ocp-config/cm.yml +++ b/ods-provisioning-app/ocp-config/cm.yml @@ -125,9 +125,9 @@ objects: logging.file.path=${PROV_APP_LOGGING_FILE_PATH} # atlassian API calls take sooo long - server.servlet.session.timeout=240 + server.servlet.session.timeout=1200 server.connection-timeout=90000 - spring.session.timeout=240 + spring.session.timeout=1200 spring.mvc.async.request-timeout=90000 frontend.spa.enabled=${PROV_APP_FRONT_SPA_ENABLED}