@@ -729,26 +729,28 @@ el9_asan_docker_image:
729729
730730 # install dependencies
731731 - exec_cmd eos-mgm1 'yum -y install nodejs npm git make tar'
732-
732+
733733 # Install go
734734 - exec_cmd eos-mgm1 "export PATH=\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH\" && /usr/bin/wget https://go.dev/dl/go1.25.1.linux-amd64.tar.gz && /usr/bin/tar -C /usr/local -xzf go1.25.1.linux-amd64.tar.gz && ln -s /usr/local/go/bin/go /usr/bin/go && ln -s /usr/local/go/bin/gofmt /usr/bin/gofmt || echo Failed to install golang"
735735 - exec_cmd eos-mgm1 'npm install -g @intuit/judo'
736736
737737 # Build reva from latest tag
738738 - exec_cmd eos-mgm1 'git clone https://github.com/cs3org/reva.git'
739- - exec_cmd eos-mgm1 'export PATH="$(/usr/bin/go env GOPATH)/bin:$PATH"; cd reva; git fetch --tags ;
740- export latest_tag=$(git describe --tags "$(git rev-list --tags --max-count=1)") ;
741- git checkout "$latest_tag"; make reva; make cernbox-revad; mkdir -p reva/tmp'
742-
739+ - |
740+ exec_cmd eos-mgm1 'export PATH="$(/usr/bin/go env GOPATH)/bin:$PATH"; cd reva; git fetch --tags ;
741+ export latest_tag=$(git tag --sort=-version:refname | grep -E "^v[0-9]+\.[0-9]+\.[0-9]+$" | head -1) ;
742+ echo "Building reva tag: $latest_tag" ;
743+ git checkout "$latest_tag"; make reva; make cernbox-revad; mkdir -p ../tmp'
744+
743745 # Put users.json and groups.json in the right place
744746 - exec_cmd eos-mgm1 'cp reva/tests/integration/reva-cli/config/users.json tmp/users.json'
745747 - exec_cmd eos-mgm1 'cp reva/tests/integration/reva-cli/config/groups.json tmp/groups.json'
746748
747749 # Put eos path as basepath for tests:
748- - |
750+ - |
749751 exec_cmd eos-mgm1 \
750752 "find reva/tests/integration/reva-cli -type f -name '*.yaml' -exec sed -i 's|^[[:space:]]*BASEDIR: \"/localfs\"$| BASEDIR: \"/eos/test\"|' {} +"
751-
753+
752754 # Prepare mgm (add users, set vid mapping, create directory)
753755 - exec_cmd eos-mgm1 "groupadd -g 123 myusers"
754756 - exec_cmd eos-mgm1 "useradd -u 1255 -g myusers testuser"
@@ -777,12 +779,12 @@ el9_asan_docker_image:
777779
778780 # We connect over https, and the certificate is only valid for the hostname, so replace localhost with the MGM's hostname
779781 - exec_cmd eos-mgm1 'sed -i "s/^\(master_url = \"https:\/\/\)localhost\(:[0-9][0-9]*\"\)/\1$(hostname -f)\2/" reva/tests/integration/reva-cli/config/revad-eos.toml'
780-
782+
781783 # Start revad
782- - exec_cmd eos-mgm1 './reva/cmd/revad/revad -c reva/tests/integration/reva-cli/config/revad-eos.toml </dev/null >revad.log 2>&1 & echo $! > revad.pid'
783-
784+ - exec_cmd eos-mgm1 './reva/cmd/revad/revad -c reva/tests/integration/reva-cli/config/revad-eos.toml </dev/null >revad.log 2>&1 & echo $! > revad.pid'
785+
784786 # Tests and debug output
785- - exec_cmd eos-mgm1 "cd reva; make test-reva-cli"
787+ - exec_cmd eos-mgm1 "cd reva; make test-reva-cli"
786788 - exec_cmd eos-mgm1 "eos vid ls"
787789 - exec_cmd eos-mgm1 "eos access ls"
788790 - exec_cmd eos-mgm1 "cat revad.log"
0 commit comments