From 40c465e8e52ca9f8bd3370a3c227bcac9a3535eb Mon Sep 17 00:00:00 2001 From: Jon Levell Date: Wed, 4 May 2022 14:35:25 +0100 Subject: [PATCH 1/3] [patch] Initial barebones Download page to test deploying it --- .../buildcontainer/jenkins.updatedownloadwww | 69 +++++++++++++++++++ websites/download/index.html | 12 ++++ 2 files changed, 81 insertions(+) create mode 100644 server_build/buildcontainer/jenkins.updatedownloadwww create mode 100644 websites/download/index.html diff --git a/server_build/buildcontainer/jenkins.updatedownloadwww b/server_build/buildcontainer/jenkins.updatedownloadwww new file mode 100644 index 00000000..a37ff387 --- /dev/null +++ b/server_build/buildcontainer/jenkins.updatedownloadwww @@ -0,0 +1,69 @@ +//This is a more customisable version of the default Jenkinsfile stored at in the root folder of the project +//This version allows (in particular) choosing which Linux distribution to build on +pipeline { + + parameters{ + gitParameter branchFilter: 'origin/(.*)', defaultValue: 'master', name: 'branchName', type: 'PT_BRANCH',description: 'Branch to get the websites/download HTML Download page(s) from' + } + + agent { + kubernetes { + label "amlen-downloadwww-update-pod" + yaml """ +apiVersion: v1 +kind: Pod +spec: + containers: + - name: jnlp + resources: + limits: + memory: "300Mi" + cpu: "200m" + requests: + memory: "300Mi" + cpu: "200m" + volumeMounts: + - name: volume-known-hosts + mountPath: /home/jenkins/.ssh + volumes: + - name: volume-known-hosts + configMap: + name: known-hosts +""" + } + } + + + + stages { + stage('DeployDownloadWWW') { + steps { + container('jnlp') { + sshagent ( ['projects-storage.eclipse.org-bot-ssh']) { + sh ''' + pwd + echo ${GIT_BRANCH} + NOORIGIN_BRANCH=${GIT_BRANCH#origin/} # turns origin/master into master + scp -o BatchMode=yes -r websites/download/* genie.amlen@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/amlen/ + ''' + } + } + } + } + } + post { + // send a mail on unsuccessful and fixed builds + unsuccessful { // means unstable || failure || aborted + emailext subject: 'Build $BUILD_STATUS $PROJECT_NAME #$BUILD_NUMBER!', + body: '''Check console output at $BUILD_URL to view the results.''', + recipientProviders: [culprits(), requestor()], + to: 'levell@uk.ibm.com' + } + fixed { // back to normal + emailext subject: 'Build $BUILD_STATUS $PROJECT_NAME #$BUILD_NUMBER!', + body: '''Check console output at $BUILD_URL to view the results.''', + recipientProviders: [culprits(), requestor()], + to: 'levell@uk.ibm.com' + } + } +} diff --git a/websites/download/index.html b/websites/download/index.html new file mode 100644 index 00000000..0e7ad85e --- /dev/null +++ b/websites/download/index.html @@ -0,0 +1,12 @@ + + +Eclipse Amlen Downloads + +

Eclipse Amlen™ Downloads

+ + + From 8fd5e940b09ff0d777f20df3dd9b917fffab35d1 Mon Sep 17 00:00:00 2001 From: Jon Levell Date: Wed, 4 May 2022 17:07:32 +0100 Subject: [PATCH 2/3] [patch] First real go at a download page for 1.0rc1 --- websites/download/downloads.css | 30 +++++++++++++++++++ websites/download/index.html | 52 +++++++++++++++++++++++++++++---- 2 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 websites/download/downloads.css diff --git a/websites/download/downloads.css b/websites/download/downloads.css new file mode 100644 index 00000000..9f56f2a0 --- /dev/null +++ b/websites/download/downloads.css @@ -0,0 +1,30 @@ +/* Sidebars style based on https://every-layout.dev/layouts/sidebar/ */ + +.mainpage { + display: flex; + flex-wrap: wrap; + gap: var(--s1); + font-family: Arial, Helvetica, sans-serif; +} + +.mainpage > :first-child { + flex-grow: 1; + background: #cccccc; + padding: 1em; +} + +.mainpage > :last-child { + flex-basis: 0; + flex-grow: 999; + min-inline-size: 50%; + padding-left: 1em; + padding-right: 1em; +} + +#maincontent > h1 { + background: #4444aa; + color: #ffffff; + padding: 0.5em; + font-family: Arial, Helvetica, sans-serif; + margin-top: 0px; + } diff --git a/websites/download/index.html b/websites/download/index.html index 0e7ad85e..927e1b41 100644 --- a/websites/download/index.html +++ b/websites/download/index.html @@ -1,12 +1,52 @@ + Eclipse Amlen Downloads + + -

Eclipse Amlen™ Downloads

- +
+ +
+

Eclipse Amlen™ Downloads

+ +

1.0 Release Candidate 1 (1.0rc1)

+ +

1.0rc1 is now available!

+ + +

Older Releases

+

Older Releases can be seen here (or in the archives)

+ +

Snapshot Builds

+

Snapshot builds of dev branches are also available. Some older snapshot may be available in the archives

+
+
From e1c46f2aea0cfe61f8b0763a6ccf3680c432994a Mon Sep 17 00:00:00 2001 From: Jon Levell Date: Fri, 6 May 2022 13:55:31 +0100 Subject: [PATCH 3/3] [patch] Fix up comments in the Jenkins that updates the download page --- server_build/buildcontainer/jenkins.updatedownloadwww | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server_build/buildcontainer/jenkins.updatedownloadwww b/server_build/buildcontainer/jenkins.updatedownloadwww index a37ff387..43b76467 100644 --- a/server_build/buildcontainer/jenkins.updatedownloadwww +++ b/server_build/buildcontainer/jenkins.updatedownloadwww @@ -1,5 +1,8 @@ -//This is a more customisable version of the default Jenkinsfile stored at in the root folder of the project -//This version allows (in particular) choosing which Linux distribution to build on +//The download page (https://download.eclipse.org/amlen) is different to the main Amlen website +//(https://www.eclipse.org/amlen). The main website has it's own git repo. The downloads page +//can only be updated (as far as I can tell) from the Jenkins for the main product source repo. +//Thus this jenkins script which copes the simple download page files from the product source +//to the Eclipse download server pipeline { parameters{