Skip to content

Commit dc46a5e

Browse files
committed
address comments
1 parent 64ed9e5 commit dc46a5e

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ stages:
3232
displayName: ${{ parameters.displayName }} - Create Cluster
3333
condition: or(
3434
eq('${{ parameters.os }}', 'linux'),
35-
and(eq('${{ parameters.os }}', 'windows'), eq(dependencies.setup.outputs['env.GitDiffCheck.RunWindowsTests'], 'false'))
35+
and(eq('${{ parameters.os }}', 'windows'), eq(dependencies.setup.outputs['env.GitDiffCheck.RunWindowsTests'], 'true'))
3636
)
3737
dependsOn:
3838
- ${{ parameters.dependsOn }}

.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-job-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ stages:
6262

6363
- stage: ${{ parameters.name }}
6464
displayName: E2E-${{ parameters.displayName }}
65-
condition: and(succeeded(), eq(dependencies.setup.outputs['env.GitDiffCheck.RunCiliumTests'], 'true'))
65+
condition: and(succeeded(), eq(variables.TAG, variables.CURRENT_VERSION), eq(dependencies.setup.outputs['env.GitDiffCheck.RunCiliumTests'], 'true'))
6666
variables:
6767
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
6868
CURRENT_VERSION: $[ stagedependencies.containerize.check_tag.outputs['CurrentTagManifests.currentTagManifests'] ]

.pipelines/templates/git-diff-check.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,12 @@ steps:
3333
echo "Current commit: $(Build.SourceVersion)"
3434
echo "Target branch: $TARGET_BRANCH"
3535
36-
# Ensure the target branch ref is available locally
37-
git fetch origin "$TARGET_BRANCH" --depth=1 2>/dev/null || true
36+
# Ensure the target branch ref is available locally, fall back to master if it doesn't exist
37+
if ! git fetch origin "$TARGET_BRANCH" --depth=1 2>/dev/null; then
38+
echo "Failed to fetch '$TARGET_BRANCH', falling back to master"
39+
TARGET_BRANCH="master"
40+
git fetch origin master --depth=1
41+
fi
3842
3943
OUTPUT=$(bash hack/scripts/check-changed-files.sh "$TARGET_BRANCH")
4044
echo "$OUTPUT"

0 commit comments

Comments
 (0)