From 24a9cf706f92e4fee987ba56287a356c7a718a97 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Tue, 21 May 2019 14:18:08 +0200 Subject: Remove old doc update job and remove old content from new job MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Delete the old multiversion job and also make the new job remove old content. Change-Id: I729c44723ad0063bea9614e9c9a0e6d2bb163d6f Bug-AGL: SPEC-2419 Signed-off-by: Jan-Simon Möller --- .../daily-jjb-doc-multiversion-update.local.sh | 50 ---- .../daily-jjb-doc-multiversion-update.yaml | 35 --- .../include-doc-multiversion-update.sh | 275 --------------------- .../include-doc-multiversion-upload.sh | 23 -- jjb/daily-jjb-doc-multiversion-update/setupdocs.sh | 143 ----------- jjb/daily-jjb-doc-update/include-doc-upload.sh | 2 +- 6 files changed, 1 insertion(+), 527 deletions(-) delete mode 100755 jjb/daily-jjb-doc-multiversion-update/daily-jjb-doc-multiversion-update.local.sh delete mode 100644 jjb/daily-jjb-doc-multiversion-update/daily-jjb-doc-multiversion-update.yaml delete mode 100644 jjb/daily-jjb-doc-multiversion-update/include-doc-multiversion-update.sh delete mode 100644 jjb/daily-jjb-doc-multiversion-update/include-doc-multiversion-upload.sh delete mode 100755 jjb/daily-jjb-doc-multiversion-update/setupdocs.sh (limited to 'jjb') diff --git a/jjb/daily-jjb-doc-multiversion-update/daily-jjb-doc-multiversion-update.local.sh b/jjb/daily-jjb-doc-multiversion-update/daily-jjb-doc-multiversion-update.local.sh deleted file mode 100755 index e0fc9ea7..00000000 --- a/jjb/daily-jjb-doc-multiversion-update/daily-jjb-doc-multiversion-update.local.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -set -e - -# make sure 'node' is in path (debian calls it nodejs) -mkdir -p bin -ln -sf /usr/bin/nodejs bin/node -export PATH=$PATH:`pwd`/bin - -[[ -z "$WORKSPACE" ]] && WORKSPACE=$(pwd -P) -HTDOCS=${HTDOCS:-$WORKSPACE/htdocs} - -. include-doc-multiversion-update.sh - -( sleep 7 ; firefox http://127.0.0.1:8000 ) & - -cd $HTDOCS - -node < {global[m] = require(m);} ); -var port=process.argv[2] || 8000; - -http.createServer(function(request, response) { - var uri=url.parse(request.url).pathname; - var filename=path.join(process.cwd(), uri); - fs.exists(filename,function(exists) { - if(!exists) { - response.writeHead(404, {"Content-Type": "text/plain"}); - response.write("404 Not Found\n"); - response.end(); - return; - } - if (fs.statSync(filename).isDirectory()) filename+='/index.html'; - fs.readFile(filename,"binary",function(err, file) { - if(err) { - response.writeHead(500,{"Content-Type": "text/plain"}); - response.write(err+"\n"); - response.end(); - return; - } - response.writeHead(200); - response.write(file,"binary"); - response.end(); - }); - }); -}).listen(parseInt(port,10)); -console.log("Static file server running at\n => http://localhost:" + port + "/\nCTRL + C to shutdown"); -EOF - diff --git a/jjb/daily-jjb-doc-multiversion-update/daily-jjb-doc-multiversion-update.yaml b/jjb/daily-jjb-doc-multiversion-update/daily-jjb-doc-multiversion-update.yaml deleted file mode 100644 index b106c7bb..00000000 --- a/jjb/daily-jjb-doc-multiversion-update/daily-jjb-doc-multiversion-update.yaml +++ /dev/null @@ -1,35 +0,0 @@ ---- -- project: - name: daily-jjb-doc-multiversion - jobs: - - daily-jjb-doc-multiversion-update - -- job-template: - name: 'daily-jjb-doc-multiversion-update' - project-type: freestyle - concurrent: false - node: agl-test-slave - description: "Managed by JJB. Do not Edit. \ -
Build time graph:
" - - build-discarder: - days-to-keep: 30 - num-to-keep: 40 - artifact-days-to-keep: -1 - artifact-num-to-keep: 5 - - triggers: - - timed: '@daily' - - wrappers: - - agl-infra-wrappers: - build-timeout: '{build-timeout}' - - ssh-agent-credentials: - users: - - 'jenkins-github-agldocs' - - builders: - - shell: - !include-raw-escape: include-doc-multiversion-update.sh - - shell: - !include-raw-escape: include-doc-multiversion-upload.sh diff --git a/jjb/daily-jjb-doc-multiversion-update/include-doc-multiversion-update.sh b/jjb/daily-jjb-doc-multiversion-update/include-doc-multiversion-update.sh deleted file mode 100644 index 9d1ad98f..00000000 --- a/jjb/daily-jjb-doc-multiversion-update/include-doc-multiversion-update.sh +++ /dev/null @@ -1,275 +0,0 @@ -#!/bin/bash -set -e - -# make sure 'node' is in path (debian calls it nodejs) -mkdir -p bin -ln -sf /usr/bin/nodejs bin/node -export PATH=$PATH:`pwd`/bin - -[[ -z "$WORKSPACE" ]] && WORKSPACE=$(pwd -P) -echo "Using workspace $WORKSPACE" -TMPDIR=${TMPDIR:-$WORKSPACE/docs-webtemplate} -HTDOCS=${HTDOCS:-$WORKSPACE/htdocs} -mkdir -p $HTDOCS - -trap "rm -rf $WORKSPACE/setupdocs.sh $TMPDIR" STOP INT QUIT EXIT - -# setupdocs is already imported from automotive-grade-linux/docs-webtemplate -#wget -O $WORKSPACE/setupdocs.sh https://raw.githubusercontent.com/automotive-grade-linux/docs-webtemplate/master/setupdocs.sh -wget -O $WORKSPACE/setupdocs.sh https://git.automotivelinux.org/ci-management/plain/jjb/daily-jjb-doc-multiversion-update/setupdocs.sh - -chmod +x $WORKSPACE/setupdocs.sh - -function gensite() { - local branch=${1:-master} - local tmp=$TMPDIR/$branch - - mkdir -p $tmp - - $WORKSPACE/setupdocs.sh -w master -d $tmp - - pushd $tmp - - tocsdir="tocs_$branch" - # exception for master branch to keep aligned with legacy tocs_agl - [[ "$branch" == "master" ]] && tocsdir="tocs" - - sed -i "s|^baseurl:.*$|baseurl: \"/$branch\"|g" conf/_dev.yml - sed -i "s|^docsurl:.*$|docsurl: \"/$branch/docs\"|g" conf/_config.yml - cat <<-EOF >>conf/AppDefaults.js - config.TOCS_DIR="$PWD/content/$tocsdir"; - config.AGL_GERRIT_BRANCH="$branch"; - config.AGL_GITHUB_BRANCH="$branch"; - EOF - - navbarColor="#222" - typeDocStr="master branch" - if [ "$branch" == "flounder" ]; then - navbarColor="darkslategray" - typeDocStr="Flounder release" - fi - if [ "$branch" == "guppy" ] ; then - navbarColor="#054458" - typeDocStr="Guppy release" - fi - - git apply < - --