From dc0ffc4f269dd607c55add07bebd62b85ab45686 Mon Sep 17 00:00:00 2001 From: Antoine Taillefer Date: Wed, 11 Aug 2021 17:47:50 +0200 Subject: [PATCH] NXBT-3528: Use 2021.x Docker image instead of 11.x --- Jenkinsfile | 6 +++--- README.md | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ae90d3a..760c1a5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -154,9 +154,9 @@ pipeline { } parameters { - string(name: 'NUXEO_VERSION', defaultValue: '11.x', description: 'Version of the Nuxeo server image, defaults to 11.x.') + string(name: 'NUXEO_VERSION', defaultValue: '2021.x', description: 'Version of the Nuxeo server image, defaults to 2021.x.') string(name: 'NUXEO_REPOSITORY', defaultValue: '', description: 'GitHub repository of the nuxeo project.') - string(name: 'NUXEO_SHA', defaultValue: '', description: 'Git commit sha of the nuxeo/nuxeo upstream build.') + string(name: 'NUXEO_SHA', defaultValue: '', description: 'Git commit sha of the nuxeo/lts/nuxeo upstream build.') } environment { @@ -174,7 +174,7 @@ pipeline { KAFKA_CHART_VERSION = '11.8.8' NUXEO_CHART_NAME = 'nuxeo' NUXEO_CHART_VERSION = '~2.0.0' - NUXEO_DOCKER_REPOSITORY = "${isTriggered() ? DOCKER_REGISTRY : PUBLIC_DOCKER_REGISTRY}/nuxeo/nuxeo" + NUXEO_DOCKER_REPOSITORY = "${isTriggered() ? DOCKER_REGISTRY : PRIVATE_DOCKER_REGISTRY}/nuxeo/nuxeo" NUXEO_VERSION = "${params.NUXEO_VERSION}" HELM_VALUES_DIR = 'helm' NAMESPACE = "nuxeo-rest-api-tests-$BRANCH_NAME-$BUILD_NUMBER".toLowerCase() diff --git a/README.md b/README.md index 0579448..f2d2b65 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ ## Purpose -This project allows to validate the REST API versions that are supported in the [master branch](https://github.com/nuxeo/nuxeo) of the Nuxeo Platform. +This project allows to validate the REST API versions that are supported in the [2021 branch](https://github.com/nuxeo/nuxeo-lts) of the Nuxeo Platform. For each REST API version, we need to guarantee the following assertion: @@ -106,15 +106,15 @@ yarn format This set of tests is executed in a [multibranch pipeline](https://jenkins.platform.dev.nuxeo.com/job/nuxeo/job/rest-api-compatibility-tests/) against a Nuxeo server configured as following: -- Docker image: `nuxeo/nuxeo:11.x` +- Docker image: `docker-private.packages.nuxeo.com/nuxeo/nuxeo:2021.x` - MongoDB - Elasticsearch The build fails if at least one test fails. -This job is also triggered by the [nuxeo/nuxeo](https://jenkins.platform.dev.nuxeo.com/job/nuxeo/job/nuxeo/) multibranch pipeline: +This job is also triggered by the [nuxeo/lts/nuxeo](https://jenkins.platform.dev.nuxeo.com/job/nuxeo/job/lts/job/nuxeo/) multibranch pipeline: - On pull requests, to run the REST API tests against the Nuxeo image freshly built from the related branch, and set a GitHub status check on the pull request. -- On the `master` branch, to run the REST API tests against the `nuxeo/nuxeo:11.x` image freshly built from the `master` branch. +- On the `2021` branch, to run the REST API tests against the `docker-private.packages.nuxeo.com/nuxeo/nuxeo:2021.x` image freshly built from the `2021` branch. This adds a quality gate for the continuous delivery of the Nuxeo server.