From 2601be3f18601a5360a9b6221853e7ac493ae0d7 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Mon, 22 Jul 2024 22:03:01 +0000 Subject: [PATCH] Merged in exclude-9-0-0 (pull request #172) Temporarily exclude 9.0.0 * Skip 9.0.0 * Use 8.9.4 for branches and PR builds * Update snyk ignore * Override test version * Update .snyk Approved-by: Adam Brokes --- .snyk | 44 ++++-------- bitbucket-pipelines.yml | 139 +++++++++++++++++++++++++------------ bitbucket-pipelines.yml.j2 | 10 ++- 3 files changed, 114 insertions(+), 79 deletions(-) diff --git a/.snyk b/.snyk index 6b2772d..b855289 100644 --- a/.snyk +++ b/.snyk @@ -5,39 +5,19 @@ # According to https://access.redhat.com/security/cve/cve-2024-2961#Mitigation ubi tags aren't vulnerable ignore: - SNYK-RHEL9-GLIBCMINIMALLANGPACK-6624576: - - '*': - reason: Not vulnerable - expires: 2034-06-01T00:00:00.000Z - SNYK-RHEL9-GLIBCHEADERS-6624580: - - '*': - reason: Not vulnerable - expires: 2034-06-01T00:00:00.000Z - SNYK-RHEL9-GLIBCCOMMON-6625493: - - '*': - reason: Not vulnerable - expires: 2034-06-01T00:00:00.000Z - SNYK-RHEL9-GLIBC-6624544: - - '*': - reason: Not vulnerable - expires: 2034-06-01T00:00:00.000Z - SNYK-RHEL9-GLIBCMINIMALLANGPACK-6678441: - - '*': - reason: Not vulnerable - expires: 2034-06-01T00:00:00.000Z - SNYK-RHEL9-GLIBCCOMMON-6678689: - - '*': - reason: Not vulnerable - expires: 2034-06-01T00:00:00.000Z - SNYK-RHEL9-GLIBC-6678806: - - '*': - reason: Not vulnerable - expires: 2034-06-01T00:00:00.000Z - SNYK-RHEL9-PYTHON3LIBS-6675303: + SNYK-RHEL9-PYTHON3SETUPTOOLS-7547262: + - '*': + reason: Waiting for a fix + expires: 2024-09-01T00:00:00.000Z + SNYK-RHEL9-PYTHON3SETUPTOOLSWHEEL-7547266: + - '*': + reason: Waiting for a fix + expires: 2024-09-01T00:00:00.000Z + SNYK-RHEL9-PYTHON3LIBS-6675303: - '*': reason: Waiting for a fix - expires: 2024-08-01T00:00:00.000Z - SNYK-RHEL9-PYTHON3-6675327: + expires: 2024-09-01T00:00:00.000Z + SNYK-RHEL9-PYTHON3-6675327: - '*': reason: Waiting for a fix - expires: 2024-08-01T00:00:00.000Z \ No newline at end of file + expires: 2024-09-01T00:00:00.000Z diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 0a509d4..65ed5da 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -52,7 +52,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -80,7 +81,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -108,7 +110,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -136,7 +139,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -164,7 +168,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -192,7 +197,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -220,7 +226,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -248,7 +255,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -275,7 +283,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -302,7 +311,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -329,7 +339,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -356,7 +367,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -383,7 +395,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -410,7 +423,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -437,7 +451,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -464,7 +479,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -492,7 +508,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -520,7 +537,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -548,7 +566,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -576,7 +595,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -604,7 +624,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -632,7 +653,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -660,7 +682,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -688,7 +711,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -716,7 +740,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -744,7 +769,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -772,7 +798,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -800,7 +827,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -828,7 +856,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -856,7 +885,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -884,7 +914,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -912,7 +943,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -938,7 +970,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -964,7 +997,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -990,7 +1024,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -1016,7 +1051,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -1042,7 +1078,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -1068,7 +1105,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -1094,7 +1132,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -1120,7 +1159,8 @@ pipelines: --jobs-total='8' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 @@ -1148,6 +1188,7 @@ pipelines: - export DOCKERFILE='Dockerfile' - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION' - export MAC_PRODUCT_KEY='confluence' + - export APP_TEST_VERSION='8.9.4' # remove it after 9.0.0 is out - py.test -v tests/ - py.test -v shared-components/tests/ @@ -1164,6 +1205,7 @@ pipelines: - export DOCKERFILE='Dockerfile.ubi' - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION' - export MAC_PRODUCT_KEY='confluence' + - export APP_TEST_VERSION='8.9.4' # remove it after 9.0.0 is out - py.test -v tests/ - step: @@ -1174,6 +1216,7 @@ pipelines: - apk add --no-cache git docker-compose jq curl - git submodule update --init --recursive - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'` + - export CONFLUENCE_VERSION="8.9.4" # remove it after 9.0.0 is out - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image . - export IS_RELEASE=false - /usr/src/app/post_build.sh test-image $IS_RELEASE @@ -1186,6 +1229,7 @@ pipelines: - apk add --no-cache git docker-compose jq curl - git submodule update --init --recursive - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'` + - export CONFLUENCE_VERSION="8.9.4" # remove it after 9.0.0 is out - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image-ubi . -f Dockerfile.ubi - export IS_RELEASE=false - /usr/src/app/post_build.sh test-image-ubi $IS_RELEASE @@ -1225,7 +1269,8 @@ pipelines: --jobs-total='1' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -1253,7 +1298,8 @@ pipelines: --jobs-total='1' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -1282,7 +1328,8 @@ pipelines: --jobs-total='1' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -1311,7 +1358,8 @@ pipelines: --jobs-total='1' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 - step: @@ -1338,7 +1386,8 @@ pipelines: --jobs-total='1' \ --docker-repos='atlassian/confluence' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 custom-release: diff --git a/bitbucket-pipelines.yml.j2 b/bitbucket-pipelines.yml.j2 index 7ed01c6..79f836b 100644 --- a/bitbucket-pipelines.yml.j2 +++ b/bitbucket-pipelines.yml.j2 @@ -62,7 +62,8 @@ pipelines: --jobs-total='{{ batches }}' \ --docker-repos='{{ appdata.docker_repos|join(',') }}' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 {% endfor %} {% endfor %} @@ -93,6 +94,7 @@ pipelines: - export DOCKERFILE='Dockerfile' - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION' - export MAC_PRODUCT_KEY='confluence' + - export APP_TEST_VERSION='8.9.4' # remove it after 9.0.0 is out - py.test -v tests/ - py.test -v shared-components/tests/ @@ -109,6 +111,7 @@ pipelines: - export DOCKERFILE='Dockerfile.ubi' - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION' - export MAC_PRODUCT_KEY='confluence' + - export APP_TEST_VERSION='8.9.4' # remove it after 9.0.0 is out - py.test -v tests/ - step: @@ -119,6 +122,7 @@ pipelines: - apk add --no-cache git docker-compose jq curl - git submodule update --init --recursive - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'` + - export CONFLUENCE_VERSION="8.9.4" # remove it after 9.0.0 is out - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image . - export IS_RELEASE=false - /usr/src/app/post_build.sh test-image $IS_RELEASE @@ -131,6 +135,7 @@ pipelines: - apk add --no-cache git docker-compose jq curl - git submodule update --init --recursive - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'` + - export CONFLUENCE_VERSION="8.9.4" # remove it after 9.0.0 is out - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image-ubi . -f Dockerfile.ubi - export IS_RELEASE=false - /usr/src/app/post_build.sh test-image-ubi $IS_RELEASE @@ -180,7 +185,8 @@ pipelines: --jobs-total='1' \ --docker-repos='{{ appdata.docker_repos|join(',') }}' \ --push \ - --platforms=linux/amd64,linux/arm64 + --platforms=linux/amd64,linux/arm64 \ + --skip-versions=9.0.0 {% endfor %} {% endfor %}