Merge branch 'legacy_0.2.8.3_split_post_test' into 'legacy_0.2.8.3'

split post test

See merge request !144

.gitlab-ci.yml

@@ -288,13 +288,24 @@ deploy-release:
     - cd gitlab_build/docker/build
     - make unstaged_deploy -O -j$(nproc) -k
 
-
 # post-build tests
 post_test:
   stage: build_collect
   script:
     - make -C gitlab_build/docker/build appimagetests_ci || exit $?
 
+# post-build tests that require our own runners (or a docker upgrade on GitLab)
+post_test_extra:
+  stage: build_collect
+  rules: 
+  - if: $CI_MERGE_REQUEST_ID
+    when: never
+  - if: $CI_COMMIT_REF_PROTECTED == "true"
+    when: on_success
+  - when: never
+  script:
+    - make -C gitlab_build/docker/build appimagetests_extra || exit $?
+
 # pack up the downloadable build files in one handy artifact
 pack:
   stage: stage

docker/build/Makefile.am

@@ -483,8 +483,6 @@ appimagetests: appimagetests.tag
 appimagetests_ci.tag: \
 	test.appimage_client_64_ubuntu_latest \
 	test.appimage_client_64_ubuntu_oldest_skewed \
-	test.appimage_server_64_ubuntu_rolling \
-	test.appimage_client_64_ubuntu_rolling \
 	test.appimage_client_64_fedora_latest \
 	test.appimage_server_64_centos_oldest \
 	test.appimage_client_64_centos_oldest \
@@ -495,6 +493,14 @@ appimagetests_ci.tag: \
 
 appimagetests_ci: appimagetests_ci.tag
 
+appimagetests_extra.tag: \
+	test.appimage_server_64_ubuntu_rolling \
+	test.appimage_client_64_ubuntu_rolling \
+	upload/.tag
+	echo > $@
+
+appimagetests_extra: appimagetests_extra.tag
+
 #***************************************************************
 
 # windows source