From 5bffa5d2311098fb8656ce8451ec46c2f24e7e12 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Wed, 16 Jun 2021 14:27:43 -0400 Subject: [PATCH] 17755: Bump up to singularity 3.7.4. Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- tools/compute-images/2649A5A9.asc | 65 ------------------- tools/compute-images/arvados-images-aws.json | 4 -- .../compute-images/arvados-images-azure.json | 4 -- tools/compute-images/scripts/base.sh | 3 +- 4 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 tools/compute-images/2649A5A9.asc diff --git a/tools/compute-images/2649A5A9.asc b/tools/compute-images/2649A5A9.asc deleted file mode 100644 index 48b6827989..0000000000 --- a/tools/compute-images/2649A5A9.asc +++ /dev/null @@ -1,65 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQGiBEQ7TOgRBADvaRsIZ3VZ6Qy7PlDpdMm97m0OfvouOj/HhjOM4M3ECbGn4cYhvN1gK586 -s3sUsUcNQ8LuWvNsYhxYsVTZymCReJMEDxod0U6/z/oIbpWv5svF3kplogA66Ju/6cZx62Ri -CSOkskI6A3Waj6xHyEo8AGOPfzbMoOOQ1TS1u9s2FwCgxziLwADvKYlDZnWM03QtqIJVD8UE -AOks9Q2OqFoqKarj6xTRdOYIBVEp2jhozZUZmLmzpKL9E4NKGfixqxdVimFcRUGM5h7R2w7O -RqXjCzpiPmgdv3jJLWDnmHLmMYRYQc8p5nqo8mxuO3zJugxBemWoacBDd1MJaH7nK20Hsk9L -/jvU/qLxPJotMStTnwO+EpsKHlihA/9ZpvzR1QWNUd9nSuNR3byJhaXvxqQltsM7tLqAT4qA -OJIcMjxr+qESdEbxNHM5M1Y21ZynrsQw+Fb1WHXNbP79vzOxHoZR0+OXe8uUpkri2d9iOocr -e3NUdpOOJHtl6cGGTFILt8tSuOVxMT/+nlo038JQB2jARe4B85O0tkPIPbQybmV1cm8uZGVi -aWFuLm5ldCBhcmNoaXZlIDxtaWNoYWVsLmhhbmtlQGdtYWlsLmNvbT6IRgQQEQgABgUCTVHJ -KwAKCRCNEUVjdcAkyOvzAJ0abJz+f2a6VZG1c9T8NHMTYh1atwCgt0EE3ZZd/2in64jSzu0m -iqhXbOKISgQQEQIACgUCSotRlwMFAXgACgkQ93+NsjFEvg8nJgCfWcdJbILBtpLZCocvOzlL -PqJ0Fn0AoI4EpJRxoUnrtzBGUC1MqecU7WsDiGAEExECACAFAkqLUWcCGwMGCwkIBwMCBBUC -CAMEFgIDAQIeAQIXgAAKCRCl0y8BJkmlqVklAJ4h2V6MdQkSAThF5c2Gkq6eSoIQYQCeM0DW -yB9Bl+tTPSTYXwwZi2uoif20QmFwc3kuZ3NlLnVuaS1tYWdkZWJ1cmcuZGUgRGViaWFuIEFy -Y2hpdmUgPG1pY2hhZWwuaGFua2VAZ21haWwuY29tPohGBBARAgAGBQJEO03FAAoJEPd/jbIx -RL4PU18An3tn7i4qdlMi8kHbYWFoabsKc9beAJ9sl/leZNCYNMGhz+u6BQgyeLKw94heBBMR -AgAeBQJEO0zoAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEKXTLwEmSaWpVdoAn27DvtZi -zNEbhz3wRUPQMiQjtqdvAJ9rS9YdPe5h5o5gHx3mw3BSkOttdYheBBMRAgAeBQJEO0zoAhsD -BgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEKXTLwEmSaWpVdoAoLhwWL+E+2I9lrUf4Lf26quO -K9vLAKC9ZpIF2tUirFFkBWnQvu13/TA0SokCHAQQAQIABgUCTSNBgQAKCRDAc9Iof/uem4Np -EACQ8jxmaCaS/qk/Y4GiwLA5bvKosG3BiARZ2v5UWqCZQ1tS56yKse/lCIzXQqU9BnYW6wOI -2rvFf9meLfd8h96peG6oKscsfbclLDIf68bBvGBQaD0VYFi/Fk/rxmTQBOCQ3AJZs8O5rIM4 -gPGE0QGvSZ1h7VRw3Uyeg4jKXLIeJn2xEmOJgt3auAR2FyKbzHaX9JCoByJZ/eU23akNl9hg -t7ePlpXo74KNYC58auuMUhCq3BQDB+II4ERYMcmFp1N5ZG05Cl6jcaRRHDXz+Ax6DWprRI1+ -RH/Yyae6LmKpeJNwd+vM14aawnNO9h8IAQ+aJ3oYZdRhGyybbin3giJ10hmWveg/Pey91Nh9 -vBCHdDkdPU0s9zE7z/PHT0c5ccZRukxfZfkrlWQ5iqu3V064ku5f4PBy8UPSkETcjYgDnrdn -wqIAO+oVg/SFlfsOzftnwUrvwIcZlXAgtP6MEEAs/38e/JINg4VrpdAy7HMGEUsh6Ah6lvGQ -r+zBnG44XwKfl7e0uCYkrAzUJRGM5vx9iXvFMcMujv9EBNNBOU8/Y6MBDzGZhgaoeI27nrUv -aveJXjAiDKAQWBLjtQjINZ8I9uaSGOul8kpbFavE4eS3+KhISrSHe4DuAa3dk9zI+FiPvXY1 -ZyfQBtNpR+gYFY6VxMbHhY1UlSLHO2eUIQLdYbRITmV1cm9EZWJpYW4gQXJjaGl2ZSBLZXkg -PHBrZy1leHBwc3ktbWFpbnRhaW5lcnNAbGlzdHMuYWxpb3RoLmRlYmlhbi5vcmc+iEYEEBEI -AAYFAk1RyQYACgkQjRFFY3XAJMgEWwCggx4Gqlcrt76TSMlbU94cESo55AEAoJ3asQEMpe8t -QUX+5aikw3z1AUoCiEoEEBECAAoFAkqf/3cDBQF4AAoJEPd/jbIxRL4PxyMAoKUIRPWlHCj/ -+HSFfwhos68wcSwmAKChuC00qutDro+AOo+uuq6YoHXj+ohgBBMRAgAgBQJKn/8bAhsDBgsJ -CAcDAgQVAggDBBYCAwECHgECF4AACgkQpdMvASZJpalDggCeKF9KOgOPdQbFnKXl8KtHory4 -EEwAnA7jxgorE6kk2QHEXFSF8LzOOH4GiGMEExECACMCGwMGCwkIBwMCBBUCCAMEFgIDAQIe -AQIXgAUCSp//RgIZAQAKCRCl0y8BJkmlqekFAKCRyt4+FoCzmBbRUUP3Cr8PzH++IgCgkno4 -vdjsWdyAey8e0KpITTXMFrmJAhwEEAECAAYFAk0jQYEACgkQwHPSKH/7npsFfw/+P8B8hpM3 -+T1fgboBa4R32deun8m6b8vZMXwuo/awQtMpzjem8JGXSUQm8iiX4hDtjq6ZoPrlN8T4jNmv -iBt/F5jIJji/PYmhq+Zn9s++mfx+aF4IJrcHJWFkg/6kJzn4oSdl/YlvKf4VRCcQNtj4xV87 -GsdamnzU17XapLVMbSaVKh+6Af7ZLDerEH+iAq733HsYaTK+1xKmN7EFVXgS7bZ19C4LTzc9 -7bVHSywpT9yIrg9QQs/1kshfVIHDKyhjF6IwzSVbeGAIL3Oqo5zOMkWv7JlEIkkhTyl+FETx -NMTMYjAk+Uei3kRodneq3YBF2uFYSEzrXQgHAyn37geiaMYjh8wu6a85nG1NS0SdxiZDIePm -bvD9vWxFZUWYJ/h9ifsLivWcVXlvHoQ0emd+n2aiFhAck2xsuyHgnGIZMHww5IkQdu/TMqvb -cR6d8Xulh+C4Tq7ppy+oTLADSBKII++pJQioYydRD529EUJgVlhyH27X6YAk3FuRD3zYZRYS -2QECiKXvS665o3JRJ0ZSqNgvYOom8M0zz6bI9grnUoivMI4o7ISpE4ZwffEd37HVzmraaUHD -XRhkulFSf1ImtXojV9nNSM5p/+9eP7OioTZhSote6Vj6Ja1SZeRkXZK7BwqPbdO0VsYOb7G/ -/ZiOlqs+paRr92G/pwBfj5Dq8EK5Ag0ERDtM9RAIAN0EJqBPvLN0tEin/y4Fe0R4n+E+zNXg -bBsq4WidwyUFy3h/6u86FYvegXwUqVS2OsEs5MwPcCVJOfaEthF7I89QJnP9Nfx7V5I9yFB5 -3o9ii38BN7X+9gSjpfwXOvf/wIDfggxX8/wRFel37GRB7TiiABRArBezs5x+zTXvT++WPhEl -ySj0uY8bjVR6tso+d65K0UesvAa7PPWeRS+3nhqABSFLuTTTMMbnVXCGesBrYHlFVXClAYrS -IOX8Ub/UnuEYs9+hIV7U4jKzRF9WJhIC1cXHPmOhvleAf/I9h/0KahD7HLYud40pNBo5tW8j -Sfp2/Q8TIE0xxshd51/xy4MAAwUH+wWnzsYVk981OKUEXul8JPyPxbw05fOd6gF4MJ3YodO+ -6dfoyIl3bewk+11KXZQALKaO1xmkAEO1RqizPeetoadBVkQBp5xPudsVElUTOX0pTYhkUd3i -BilsCYKK1/KQ9KzDI+O/lRsm6L9lc6rV0IgPU00P4BAwR+x8Rw7TJFbuS0miR3lP1NSguz+/ -kpjxzmGPLyHJ+LVDYFkk6t0jPXhqFdUY6McUTBDEvavTGlVO062l9APTmmSMVFDsPN/rBes2 -rYhuuT+lDp+gcaS1UoaYCIm9kKOteQBnowX9V74Z+HKEYLtwILaSnNe6/fNSTvyjg0z+R+sP -CY4nHewbVC+ISQQYEQIACQUCRDtM9QIbDAAKCRCl0y8BJkmlqbecAJ9BUdSKVg9H+fQNyP5s -bOjj4RDtdACfXHrRHa2+XjJP0dhpvJ8IfvYnQsU= -=fAJZ ------END PGP PUBLIC KEY BLOCK----- diff --git a/tools/compute-images/arvados-images-aws.json b/tools/compute-images/arvados-images-aws.json index 64b611e5e2..4d757abfd2 100644 --- a/tools/compute-images/arvados-images-aws.json +++ b/tools/compute-images/arvados-images-aws.json @@ -60,10 +60,6 @@ "type": "file", "source": "1078ECD7.asc", "destination": "/tmp/1078ECD7.asc" - },{ - "type": "file", - "source": "2649A5A9.asc", - "destination": "/tmp/2649A5A9.asc" },{ "type": "file", "source": "scripts/etc-cloud-cloud.cfg.d-07_compute_arvados_dispatch_cloud.cfg", diff --git a/tools/compute-images/arvados-images-azure.json b/tools/compute-images/arvados-images-azure.json index 5397927a11..ec1d9b6a63 100644 --- a/tools/compute-images/arvados-images-azure.json +++ b/tools/compute-images/arvados-images-azure.json @@ -49,10 +49,6 @@ "type": "file", "source": "1078ECD7.asc", "destination": "/tmp/1078ECD7.asc" - },{ - "type": "file", - "source": "2649A5A9.asc", - "destination": "/tmp/2649A5A9.asc" },{ "type": "file", "source": "scripts/etc-cloud-cloud.cfg.d-07_compute_arvados_dispatch_cloud.cfg", diff --git a/tools/compute-images/scripts/base.sh b/tools/compute-images/scripts/base.sh index c5176448f9..d1f990c3b3 100644 --- a/tools/compute-images/scripts/base.sh +++ b/tools/compute-images/scripts/base.sh @@ -61,7 +61,6 @@ wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get -qq --yes ins xfsprogs # Install the Arvados packages we need -wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get --yes update wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get -qq --yes install \ python3-arvados-fuse \ crunch-run \ @@ -75,7 +74,7 @@ rm -rf /var/lib/arvados/go/ curl -s https://storage.googleapis.com/golang/go${goversion}.linux-amd64.tar.gz | tar -C /var/lib/arvados -xzf - ln -sf /var/lib/arvados/go/bin/* /usr/local/bin/ -singularityversion=3.5.2 +singularityversion=3.7.4 curl -Ls https://github.com/sylabs/singularity/archive/refs/tags/v${singularityversion}.tar.gz | tar -C /var/lib/arvados -xzf - cd /var/lib/arvados/singularity-${singularityversion} -- 2.30.2