From 21acc5a761e2a8c8402853c4b9e3ba72f1b51cb6 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 30 Jan 2019 08:59:18 +0100
Subject: [PATCH] [docs] Some cleanup.
---
ThirdParty/cmake-modules | 2 +-
scripts/jenkins/coverage.groovy | 23 ---------------------
scripts/jenkins/docset.groovy | 15 --------------
scripts/jenkins/gcc-tests-large.groovy | 28 --------------------------
4 files changed, 1 insertion(+), 67 deletions(-)
delete mode 100644 scripts/jenkins/coverage.groovy
delete mode 100644 scripts/jenkins/docset.groovy
delete mode 100644 scripts/jenkins/gcc-tests-large.groovy
diff --git a/ThirdParty/cmake-modules b/ThirdParty/cmake-modules
index f4b0a053e53..819ad94ebd3 160000
--- a/ThirdParty/cmake-modules
+++ b/ThirdParty/cmake-modules
@@ -1 +1 @@
-Subproject commit f4b0a053e53de2f4fc75a36af1dd0eede236fc68
+Subproject commit 819ad94ebd33c80da2772dc82319f77cc14bf175
diff --git a/scripts/jenkins/coverage.groovy b/scripts/jenkins/coverage.groovy
deleted file mode 100644
index 268f7fa9f7b..00000000000
--- a/scripts/jenkins/coverage.groovy
+++ /dev/null
@@ -1,23 +0,0 @@
-defaultDockerArgs = '-v /home/jenkins/.ccache:/usr/src/.ccache'
-
-def configure = new ogs.configure()
-def build = new ogs.build()
-
-def image = docker.image('ogs6/gcc-base:latest')
-image.pull()
-image.inside(defaultDockerArgs) {
- stage('Configure (Coverage)') {
- configure.linux(cmakeOptions: '-DOGS_COVERAGE=ON', script: this)
- }
-
- stage('Build (Coverage)') {
- build.linux(
- script: this,
- target: 'testrunner_coverage_cobertura'
- )
- }
-}
-
-stage('Publish (Coverage)') {
- step([$class: 'CoberturaPublisher', coberturaReportFile: 'build/*.xml'])
-}
diff --git a/scripts/jenkins/docset.groovy b/scripts/jenkins/docset.groovy
deleted file mode 100644
index 3286d8d3d90..00000000000
--- a/scripts/jenkins/docset.groovy
+++ /dev/null
@@ -1,15 +0,0 @@
-def post = new ogs.post()
-
-stage('Docset') {
- sh("""
- rm -rf build; mkdir build; cd build
- cmake -DDOCS_GENERATE_DOCSET=ON ../ogs
- cmake --build . --config Release --target doc
-
- cd docs
- tar --exclude='.DS_Store' -cvzf ogs6.tgz ogs6.docset
- """.stripIndent())
- archiveArtifacts 'build/docs/ogs6.tgz, build/docs/ogs6.xml'
-
- post.cleanup()
-}
diff --git a/scripts/jenkins/gcc-tests-large.groovy b/scripts/jenkins/gcc-tests-large.groovy
deleted file mode 100644
index 13c63abcdcf..00000000000
--- a/scripts/jenkins/gcc-tests-large.groovy
+++ /dev/null
@@ -1,28 +0,0 @@
-def defaultDockerArgs = '-v /home/jenkins/.ccache:/usr/src/.ccache'
-def defaultCMakeOptions =
- '-DCMAKE_BUILD_TYPE=Release ' +
- '-DOGS_USE_LIS=ON'
-
-def configure = new ogs.configure()
-def build = new ogs.build()
-def post = new ogs.post()
-def helper = new ogs.helper()
-
-node('envinf11w') {
- checkout scm
- def image = docker.image('ogs6/gcc-gui:latest')
- image.pull()
- image.inside(defaultDockerArgs) {
- stage('Configure') { configure.linux(cmakeOptions: defaultCMakeOptions,
- script: this) }
- stage('Build') { build.linux(script: this) }
- stage('Test') { build.linux(cmd: 'make -j 1',
- script: this,
- target: 'tests ctest-large-serial') }
- }
-
- stage('Post') {
- post.publishTestReports 'build/Testing/**/*.xml', 'build/Tests/testrunner.xml'
- post.cleanup()
- }
-}
--
GitLab