diff options
| author | Johan Wassberg <jocar@sunet.se> | 2025-04-07 09:42:19 +0200 |
|---|---|---|
| committer | Johan Wassberg <jocar@sunet.se> | 2025-04-07 09:42:19 +0200 |
| commit | 2002e3d0a7ec9eef7394064d8ee37aa8a780ab71 (patch) | |
| tree | 5c321f4095af4c793e495deea38c5a1754420d94 | |
| parent | 28ecf4e5b2a8ea7130590801419dc811141ac85f (diff) | |
All hosts are now on Debianmd-2025-04-07-v02
| -rw-r--r-- | metadata/Makefile.validate | 4 | ||||
| -rw-r--r-- | metadata/Makefile.validate-debian | 12 | ||||
| -rwxr-xr-x | metadata/scripts/update-and-validate.sh | 7 |
3 files changed, 3 insertions, 20 deletions
diff --git a/metadata/Makefile.validate b/metadata/Makefile.validate index 7e36f226..d0782cf4 100644 --- a/metadata/Makefile.validate +++ b/metadata/Makefile.validate @@ -6,7 +6,7 @@ all: validate validate: $(EDUGAIN) $(SWAMDI20) .time/%.validate: swamid-edugain/%.xml - @docker exec swamid-metadata-sp /var/www/scripts/importXML.bash /opt/metadata/$< Prod | grep -v "Import -> Added to db" > $@ + @docker exec metadata-sp-metadata-sp-1 /var/www/scripts/importXML.bash /opt/metadata/$< Prod | grep -v "Import -> Added to db" > $@ .time/%.validate: swamid-2.0/%.xml - @docker exec swamid-metadata-sp /var/www/scripts/importXML.bash /opt/metadata/$< Prod | grep -v "Import -> Added to db" > $@ + @docker exec metadata-sp-metadata-sp-1 /var/www/scripts/importXML.bash /opt/metadata/$< Prod | grep -v "Import -> Added to db" > $@ diff --git a/metadata/Makefile.validate-debian b/metadata/Makefile.validate-debian deleted file mode 100644 index d0782cf4..00000000 --- a/metadata/Makefile.validate-debian +++ /dev/null @@ -1,12 +0,0 @@ -EDUGAIN=$(patsubst swamid-edugain/%.xml,.time/%.validate,$(wildcard swamid-edugain/*.xml)) -SWAMDI20=$(patsubst swamid-2.0/%.xml,.time/%.validate,$(wildcard swamid-2.0/*.xml)) - -all: validate - -validate: $(EDUGAIN) $(SWAMDI20) - -.time/%.validate: swamid-edugain/%.xml - @docker exec metadata-sp-metadata-sp-1 /var/www/scripts/importXML.bash /opt/metadata/$< Prod | grep -v "Import -> Added to db" > $@ - -.time/%.validate: swamid-2.0/%.xml - @docker exec metadata-sp-metadata-sp-1 /var/www/scripts/importXML.bash /opt/metadata/$< Prod | grep -v "Import -> Added to db" > $@ diff --git a/metadata/scripts/update-and-validate.sh b/metadata/scripts/update-and-validate.sh index 9e3aa169..e25931bf 100755 --- a/metadata/scripts/update-and-validate.sh +++ b/metadata/scripts/update-and-validate.sh @@ -33,13 +33,8 @@ update() docker exec ${CONTAINER} php /var/www/scripts/updateExternalEntities.php } -CONTAINER="swamid-metadata-sp" +CONTAINER="metadata-sp-metadata-sp-1" MAKE="Makefile.validate" -if [ "$(lsb_release -i -s)" = "Debian" ]; then - CONTAINER="metadata-sp-metadata-sp-1" - MAKE="Makefile.validate-debian" -fi - cd /opt/metadata || exit 1 update |