Skip to content

Commit 45910a1

Browse files
committed
ci: suppress package-oci in parent pipeline
Commit a3409cd included one-pipeline.locked.yml in the parent pipeline to get the supported-configurations validation job templates. This accidentally also brought in shared-pipeline jobs (package-oci and its downstream) which have no access to the package loader artifacts. Fix: set SKIP_SHARED_PIPELINE=true globally in the parent pipeline so all shared-pipeline jobs from one-pipeline.yml that check this variable are suppressed. Override it to false in package-trigger so the child pipeline (package-gen.yml) still runs package-oci correctly with its needs: [package loader] override. Also suppress requirements_json_test explicitly since it does not check SKIP_SHARED_PIPELINE (it only checks DANGEROUSLY_SKIP_SHARED_PIPELINE_TESTS). It runs correctly in the child pipeline via generate-package.php overrides.
1 parent 9154809 commit 45910a1

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

.gitlab-ci.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ variables:
99
GIT_SUBMODULE_STRATEGY: recursive
1010
# Only clone libdatadog submodule by default
1111
GIT_SUBMODULE_PATHS: libdatadog
12+
# Suppress shared-pipeline jobs (package-oci and its downstream) in the
13+
# parent pipeline. They run in the child pipeline (package-gen.yml) where
14+
# package loader artifacts are available. Override to "false" in
15+
# package-trigger so the child pipeline runs them correctly.
16+
SKIP_SHARED_PIPELINE: "true"
1217
RELIABILITY_ENV_BRANCH:
1318
value: "master"
1419
description: "Run a specific datadog-reliability-env branch downstream"
@@ -97,11 +102,10 @@ package-trigger:
97102
GIT_SUBMODULE_PATHS: libdatadog appsec/third_party/cpp-base64 appsec/third_party/libddwaf appsec/third_party/msgpack-c
98103
NIGHTLY_BUILD: $NIGHTLY_BUILD
99104
RELIABILITY_ENV_BRANCH: $RELIABILITY_ENV_BRANCH
105+
SKIP_SHARED_PIPELINE: "false"
100106

101-
# package-oci runs in the child pipeline (package-gen.yml) with the correct
102-
# needs: [package loader] override. The parent pipeline doesn't have package
103-
# loader artifacts, so we suppress it here.
104-
package-oci:
107+
# requirements_json_test doesn't check SKIP_SHARED_PIPELINE, suppress explicitly
108+
requirements_json_test:
105109
rules:
106110
- when: never
107111

0 commit comments

Comments
 (0)