Skip to content

Commit

Permalink
fix(ci): [agent6] Remove internal image/k8s deploy stages (#31875)
Browse files Browse the repository at this point in the history
  • Loading branch information
chouetz authored Dec 9, 2024
1 parent 54501a6 commit cc79200
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 265 deletions.
4 changes: 0 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ include:
- .gitlab/functional_test_cleanup/functional_test_cleanup.yml
- .gitlab/install_script_testing/install_script_testing.yml
- .gitlab/integration_test/include.yml
- .gitlab/internal_image_deploy/internal_image_deploy.yml
- .gitlab/internal_kubernetes_deploy/include.yml
- .gitlab/junit_upload/junit_upload.yml
- .gitlab/kitchen_cleanup/include.yml
- .gitlab/kitchen_deploy/kitchen_deploy.yml
Expand Down Expand Up @@ -87,15 +85,13 @@ stages:
- trigger_release
- choco_build
- choco_deploy
- internal_image_deploy
- install_script_testing
- e2e
- kitchen_cleanup
- functional_test
- functional_test_sysprobe
- functional_test_cleanup
- junit_upload
- internal_kubernetes_deploy
- lint
- post_rc_build
- check_merge
Expand Down
8 changes: 0 additions & 8 deletions .gitlab/JOBOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,6 @@ dev_branch* @DataDog/container-integrations
dev_master* @DataDog/container-integrations
dev_nightly* @DataDog/container-integrations

# Internal image deploy
docker_trigger_internal* @DataDog/container-integrations
docker_trigger_cluster_agent_internal* @DataDog/container-integrations
docker_trigger_cws_instrumentation_internal* @DataDog/agent-security

# Internal kubernetes deploy
internal_kubernetes_deploy* @DataDog/container-integrations

# Deploy packages
deploy_packages* @DataDog/agent-build-and-releases
publish_winget* @DataDog/windows-agent
Expand Down
138 changes: 0 additions & 138 deletions .gitlab/internal_image_deploy/internal_image_deploy.yml

This file was deleted.

7 changes: 0 additions & 7 deletions .gitlab/internal_kubernetes_deploy/include.yml

This file was deleted.

65 changes: 0 additions & 65 deletions .gitlab/internal_kubernetes_deploy/internal_kubernetes_deploy.yml

This file was deleted.

38 changes: 0 additions & 38 deletions .gitlab/internal_kubernetes_deploy/rc_kubernetes_deploy.yml

This file was deleted.

4 changes: 1 addition & 3 deletions .gitlab/post_rc_build/post_rc_tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ update_rc_build_links:
stage: post_rc_build
rules:
- if: $RC_BUILD == "true"
needs:
- job: docker_trigger_internal
artifacts: false
dependencies: []
image: registry.ddbuild.io/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
tags: ["arch:amd64"]
script:
Expand Down
4 changes: 2 additions & 2 deletions tasks/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -1605,7 +1605,7 @@ def _check_commit_in_repo(repo_name, branch, release_json_field):


@task
def update_build_links(_ctx, new_version):
def update_build_links(_, new_version):
"""
Updates Agent release candidates build links on https://datadoghq.atlassian.net/wiki/spaces/agent/pages/2889876360/Build+links
Expand All @@ -1619,7 +1619,7 @@ def update_build_links(_ctx, new_version):
from atlassian import Confluence
from atlassian.confluence import ApiError

BUILD_LINKS_PAGE_ID = 2889876360
BUILD_LINKS_PAGE_ID = 4463690547

match = RC_VERSION_RE.match(new_version)
if not match:
Expand Down

0 comments on commit cc79200

Please sign in to comment.