Merge branch 'master' of scm.uninett.no:maalepaaler/mp-rude

.gitlab-ci.yml

@@ -22,12 +22,13 @@ deploy-apt:
     paths:
       - build-stretch
   script:
-    - apt-get update && apt-get install ssh -y
+    - apt-get update && apt-get install openssh-client -y
     - (
         umask 077;
         mkdir -p ~/.ssh;
         echo "${SSH_PRIVKEY}" > ~/.ssh/id_rsa;
         echo "${SSH_APT_HOSTKEY}" > ~/.ssh/known_hosts;
       )
-    - scp build-stretch/*.deb jenkins@apt.uninett.no:/www/apt.uninett.no/htdocs/debian/pool/stretch/mp/binary-all/m/
+    - ssh jenkins@apt.uninett.no mkdir -p /www/apt.uninett.no/htdocs/debian/pool/stretch/main/all/m
+    - scp build-stretch/*.deb jenkins@apt.uninett.no:/www/apt.uninett.no/htdocs/debian/pool/stretch/main/all/m/
     - ssh jenkins@apt.uninett.no /www/apt.uninett.no/bin/mkrepo.debian