Update global haproxy to match OOO

[releng/builder.git] / jjb / autorelease / update-validate-autorelease-projects.sh

diff --git a/jjb/autorelease/update-validate-autorelease-projects.sh b/jjb/autorelease/update-validate-autorelease-projects.sh
index 0dee6f94d051e9048fed2c741c03899120f0f8da..5bc1901a4e8dc3872ae71cd6e033e08d77ad22f8 100644 (file)
--- a/jjb/autorelease/update-validate-autorelease-projects.sh
+++ b/jjb/autorelease/update-validate-autorelease-projects.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 - 2018 The Linux Foundation and others.
@@ -38,14 +38,14 @@ cat > "$YAML_FILE" << EOF
 EOF
 
 for module in "${modules[@]}"; do
+    # TODO: Remove this once mdsal fully becomes an MRI project.
+    if [ "$module" == "mdsal" ] && [ "$BRANCH" == "master" ]; then
+        continue
+    fi
+
     echo "Include $module"
     echo "      - ${module//\//-}:" >> "$YAML_FILE"
     echo "          project: $module" >> "$YAML_FILE"
-
-    # TODO: Remove this once mdsal fully becomes an MRI project.
-    if [ "$module" == "mdsal" ]; then
-        echo "          branch: v2.6.x" >> "$YAML_FILE"
-    fi
 done
 
 git add "${YAML_FILE}"