jenkins-bot has submitted this change and it was merged.

Change subject: operations-apache-config-lint checks redirects.conf
......................................................................


operations-apache-config-lint checks redirects.conf

operations-apache-config-lint needed to execute the
refreshDomainRedirects and then verify that provided redirects.conf
match expectation.

Change-Id: I3fb561dc5668076c574e77e912a76e7242332f68
---
M operations-apache-config.yaml
1 file changed, 17 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/operations-apache-config.yaml b/operations-apache-config.yaml
index c61623c..785d12b 100644
--- a/operations-apache-config.yaml
+++ b/operations-apache-config.yaml
@@ -19,6 +19,23 @@
             | ( cd "$WORKSPACE" && tar xf -)
 
      - shell: |
+        echo "Regenerating redirects.conf should not have changed"
+        ./refreshDomainRedirects
+
+        set +e
+        git diff --color=always --exit-code
+        HAS_CHANGE=$?
+        set -e
+
+        if [ $HAS_CHANGE -ne 0 ]; then
+            echo "Generated redirects.conf does not match the one proposed"
+            exit 1
+        else
+            echo "Generated redirects.conf match the one proposed"
+            echo "Continuing.."
+        fi
+
+     - shell: |
         #!/bin/bash -ex
         /bin/sed -i s%/etc/apache2/wmf/%% *.conf
         /bin/sed -i s%/usr/local/apache/common/%$WORKSPACE/mediawiki-config/% 
*.conf

-- 
To view, visit https://gerrit.wikimedia.org/r/102909
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3fb561dc5668076c574e77e912a76e7242332f68
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to