diff --git a/.gitlab/deploy_containers/deploy_containers_a7.yml b/.gitlab/deploy_containers/deploy_containers_a7.yml index 5f1f8f9d137fe..2d18d21dcf1ba 100644 --- a/.gitlab/deploy_containers/deploy_containers_a7.yml +++ b/.gitlab/deploy_containers/deploy_containers_a7.yml @@ -32,6 +32,17 @@ include: - if [[ "$FLAVOR" == "-linux" ]]; then export IMG_SOURCES="${IMG_LINUX_SOURCES}"; elif [[ "$FLAVOR" == "-servercore" ]]; then export IMG_SOURCES="${IMG_WINDOWS_SOURCES}"; else export IMG_SOURCES="${IMG_LINUX_SOURCES},${IMG_WINDOWS_SOURCES}"; fi - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${FLAVOR}${JMX}" +.deploy_containers-a7_win_only_image: + extends: .docker_publish_job_definition + stage: deploy_containers + dependencies: [] + before_script: + - OS=$(echo $OS_LTSC_MAPPING | cut -d ':' -f 1) + - LTSC_VERSION=$(echo $OS_LTSC_MAPPING | cut -d ':' -f 2) + - if [[ "$VERSION" == "" ]]; then VERSION="$(inv agent.version --major-version 7 --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?; fi + - IMG_BASE_SRC="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}" + - export IMG_SOURCES="${IMG_BASE_SRC}-7${JMX}-win${OS}${FLAVOR}-amd64" + - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${FLAVOR}-ltsc${LTSC_VERSION}${JMX}" .deploy_containers-a7_external: extends: .deploy_containers-a7-base @@ -45,6 +56,20 @@ include: - "-servercore" - "-linux" +.deploy_containers-a7_win_only_external: + extends: .deploy_containers-a7_win_only_image + parallel: + matrix: + - JMX: + - "" + - "-jmx" + OS_LTSC_MAPPING: + - "ltsc2022:2022" + - "1809:2019" + FLAVOR: + - "" + - "-servercore" + .deploy_containers-a7-base-ot: extends: .docker_publish_job_definition stage: deploy_containers @@ -59,6 +84,11 @@ deploy_containers-a7: rules: !reference [.manual_on_deploy_auto_on_rc] +deploy_containers-a7-win-only: + extends: .deploy_containers-a7_win_only_external + rules: + !reference [.manual_on_deploy_auto_on_rc] + deploy_containers-a7-ot: extends: .deploy_containers-a7-base-ot rules: @@ -76,6 +106,13 @@ deploy_containers-a7-rc: variables: VERSION: 7-rc +deploy_containers-a7-win-only-rc: + extends: .deploy_containers-a7_win_only_external + rules: + !reference [.on_rc] + variables: + VERSION: 7-rc + deploy_containers-a7-ot-rc: extends: .deploy_containers-a7-base-ot rules: @@ -159,6 +196,25 @@ deploy_containers_latest-a7: - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" IMG_SOURCES: "%BASE%-win1809-servercore-amd64,%BASE%-winltsc2022-servercore-amd64" IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7-servercore-jmx,${AGENT_REPOSITORY}:latest-servercore-jmx + # Windows only images + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" + IMG_SOURCES: "%BASE%-win1809-amd64" + IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7,${AGENT_REPOSITORY}:latest-ltsc2019 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" + IMG_SOURCES: "%BASE%-winltsc2022-amd64" + IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7,${AGENT_REPOSITORY}:latest-ltsc2022 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" + IMG_SOURCES: "%BASE%-win1809-servercore-amd64" + IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7-servercore-ltsc2019,${AGENT_REPOSITORY}:latest-servercore-ltsc2019 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" + IMG_SOURCES: "BASE%-winltsc2022-servercore-amd64" + IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7-servercore-ltsc2022,${AGENT_REPOSITORY}:latest-servercore-ltsc2022 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" + IMG_SOURCES: "%BASE%-winltsc2022-servercore-amd64" + IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7-servercore-ltsc2022-jmx,${AGENT_REPOSITORY}:latest-servercore-ltsc2022-jmx + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" + IMG_SOURCES: "%BASE%-winltsc1809-servercore-amd64" + IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7-servercore-ltsc2019-jmx,${AGENT_REPOSITORY}:latest-servercore-ltsc2019-jmx deploy_containers_latest-a7_internal: extends: .docker_publish_job_definition diff --git a/.gitlab/dev_container_deploy/docker_windows.yml b/.gitlab/dev_container_deploy/docker_windows.yml index 850df67aee5b5..734c81cacd36c 100644 --- a/.gitlab/dev_container_deploy/docker_windows.yml +++ b/.gitlab/dev_container_deploy/docker_windows.yml @@ -20,6 +20,7 @@ dev_branch-a7-windows: IMG_REGISTRIES: dev parallel: matrix: + # Multi-arch - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" IMG_SOURCES: "%BASE%-win1809-amd64,%BASE%-winltsc2022-amd64" IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win @@ -32,6 +33,32 @@ dev_branch-a7-windows: - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" IMG_SOURCES: "%BASE%-win1809-servercore-amd64,%BASE%-winltsc2022-servercore-amd64" IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-servercore + # ltsc2019 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" + IMG_SOURCES: "%BASE%-win1809-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-ltsc2019 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" + IMG_SOURCES: "%BASE%-win1809-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-ltsc2019 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" + IMG_SOURCES: "%BASE%-win1809-servercore-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-servercore-ltsc2019 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" + IMG_SOURCES: "%BASE%-win1809-servercore-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-servercore-ltsc2019 + # ltsc2022 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" + IMG_SOURCES: "%BASE%-winltsc2022-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-ltsc2022 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" + IMG_SOURCES: "%BASE%-winltsc2022-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-ltsc2022 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" + IMG_SOURCES: "%BASE%-winltsc2022-servercore-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-servercore-ltsc2022 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" + IMG_SOURCES: "%BASE%-winltsc2022-servercore-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-servercore-ltsc2022 dev_master-a7-windows: extends: .docker_publish_job_definition @@ -51,6 +78,7 @@ dev_master-a7-windows: IMG_REGISTRIES: dev parallel: matrix: + # Multi-arch - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" IMG_SOURCES: "%BASE%-win1809-amd64,%BASE%-winltsc2022-amd64" IMG_DESTINATIONS: agent-dev:master-py3-win @@ -63,6 +91,32 @@ dev_master-a7-windows: - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" IMG_SOURCES: "%BASE%-win1809-servercore-amd64,%BASE%-winltsc2022-servercore-amd64" IMG_DESTINATIONS: agent-dev:master-py3-jmx-win-servercore + # ltsc2019 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" + IMG_SOURCES: "%BASE%-win1809-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-ltsc2019 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" + IMG_SOURCES: "%BASE%-win1809-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-ltsc2019 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" + IMG_SOURCES: "%BASE%-win1809-servercore-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-servercore-ltsc2019 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" + IMG_SOURCES: "%BASE%-win1809-servercore-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-servercore-ltsc2019 + # ltsc2022 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" + IMG_SOURCES: "%BASE%-winltsc2022-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-ltsc2022 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" + IMG_SOURCES: "%BASE%-winltsc2022-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-ltsc2022 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" + IMG_SOURCES: "%BASE%-winltsc2022-servercore-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-servercore-ltsc2022 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" + IMG_SOURCES: "%BASE%-winltsc2022-servercore-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-servercore-ltsc2022 dev_nightly-a7-windows: extends: .docker_publish_job_definition @@ -82,6 +136,7 @@ dev_nightly-a7-windows: IMG_REGISTRIES: dev parallel: matrix: + # Multi-arch - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" IMG_SOURCES: "%BASE%-win1809-amd64,%BASE%-winltsc2022-amd64" IMG_DESTINATIONS: agent-dev:nightly-${CI_COMMIT_SHORT_SHA}-py3-win @@ -94,3 +149,29 @@ dev_nightly-a7-windows: - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" IMG_SOURCES: "%BASE%-win1809-servercore-amd64,%BASE%-winltsc2022-servercore-amd64" IMG_DESTINATIONS: agent-dev:nightly-${CI_COMMIT_SHORT_SHA}-py3-jmx-win-servercore + # ltsc2019 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" + IMG_SOURCES: "%BASE%-win1809-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-ltsc2019 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" + IMG_SOURCES: "%BASE%-win1809-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-ltsc2019 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" + IMG_SOURCES: "%BASE%-win1809-servercore-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-servercore-ltsc2019 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" + IMG_SOURCES: "%BASE%-win1809-servercore-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-servercore-ltsc2019 + # ltsc2022 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" + IMG_SOURCES: "%BASE%-winltsc2022-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-ltsc2022 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" + IMG_SOURCES: "%BASE%-winltsc2022-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-ltsc2022 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7" + IMG_SOURCES: "%BASE%-winltsc2022-servercore-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-servercore-ltsc2022 + - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx" + IMG_SOURCES: "%BASE%-winltsc2022-servercore-amd64" + IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-servercore-ltsc2022 diff --git a/releasenotes/notes/add-ltsc2019-and-ltsc2022-images-b261c1821cc50116.yaml b/releasenotes/notes/add-ltsc2019-and-ltsc2022-images-b261c1821cc50116.yaml new file mode 100644 index 0000000000000..6fa6a8f0be750 --- /dev/null +++ b/releasenotes/notes/add-ltsc2019-and-ltsc2022-images-b261c1821cc50116.yaml @@ -0,0 +1,29 @@ +# Each section from every release note are combined when the +# CHANGELOG.rst is rendered. So the text needs to be worded so that +# it does not depend on any information only available in another +# section. This may mean repeating some details, but each section +# must be readable independently of the other. +# +# Each section note must be formatted as reStructuredText. +--- +features: + - | + Add new windows images for LTSC 2019 and LTSC 2022: + - `datadog-agent:7-servercore-ltsc2019-amd64` + - `datadog-agent:7-servercore-ltsc2022-amd64` + - `datadog-agent:7-servercore-ltsc2019-jmx-amd64` + - `datadog-agent:7-servercore-ltsc2022-jmx-amd64` + - `datadog-agent:latest-servercore-ltsc2019-jmx` + - `datadog-agent:latest-servercore-ltsc2022-jmx` + - `datadog-agent:latest-servercore-ltsc2019` + - `datadog-agent:latest-servercore-ltsc2022` + - `datadog-agent:7.X.Y-ltsc2019` + - `datadog-agent:7.X.Y-ltsc2022` + - `datadog-agent:7.X.Y-ltsc2019-jmx` + - `datadog-agent:7.X.Y-ltsc2022-jmx` + - `datadog-agent:7.X.Y-servercore-ltsc2019` + - `datadog-agent:7.X.Y-servercore-ltsc2022` + - `datadog-agent:7.X.Y-servercore-ltsc2019-jmx` + - `datadog-agent:7.X.Y-servercore-ltsc2022-jmx` + - `datadog-agent:latest-ltsc2019` + - `datadog-agent:latest-ltsc2022`