diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/global-templates-python.yaml | 16 | ||||
| -rw-r--r-- | jjb/include-raw-deploy-archives.sh | 125 | ||||
| -rw-r--r-- | jjb/include-update-pom-versions-not-parent.sh | 38 | ||||
| -rw-r--r-- | jjb/include-update-pom-versions.sh | 51 | ||||
| -rw-r--r-- | jjb/integration/integration-docker.yaml | 4 | ||||
| -rw-r--r-- | jjb/integration/integration-templates-docker.yaml | 11 | ||||
| -rw-r--r-- | jjb/testsuite/testsuite.yaml | 17 |
7 files changed, 8 insertions, 254 deletions
diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index b30af0ea5..6480daa81 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -99,27 +99,11 @@ artifacts: '{archive-artifacts}' - maven-exec: maven-version: '{maven-version}' - scm: - gerrit-trigger-scm: refspec: '' choosing-strategy: 'default' submodule-recursive: '{submodule-recursive}' - - git-extra-project: - project: '{extra-project1}' - refspec: '{extra-refspec1}' - branch: '{extra-branch1}' - checkout-dir: '{checkout-dir1}' - - git-extra-project: - project: '{extra-project2}' - refspec: '{extra-refspec2}' - branch: '{extra-branch2}' - checkout-dir: '{checkout-dir2}' - - git-extra-project: - project: '{extra-project3}' - refspec: '{extra-refspec3}' - branch: '{extra-branch3}' - checkout-dir: '{checkout-dir3}' wrappers: - infra-wrappers-docker-build: diff --git a/jjb/include-raw-deploy-archives.sh b/jjb/include-raw-deploy-archives.sh deleted file mode 100644 index 4d0945aa6..000000000 --- a/jjb/include-raw-deploy-archives.sh +++ /dev/null @@ -1,125 +0,0 @@ -#!/bin/bash - -set +e # Do not affect the build result if some part of archiving fails. - -# Print out git status at the end of the build before we archive if $WORKSPACE -# is a git repo. -if [ -d "$WORKSPACE/.git" ]; then - echo "" - echo "----------> Git Status Report" - git status -fi - -echo "" -echo "----------> Archiving build to logs server" -# Configure wget to not print download status when we download logs or when -# Jenkins is installing Maven (To be clear this is the Jenkins Maven plugin -# using a shell script itself that we are unable to modify directly to affect -# wget). -echo "verbose=off" > ~/.wgetrc - -ARCHIVES_DIR="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER" -[ "$LOGS_SERVER" ] || LOGS_SERVER="https://logs.onap.org" -[ "$LOGS_REPO_URL" ] || LOGS_REPO_URL="https://nexus.onap.org/service/local/repositories/logs" - -echo "Build logs: <a href=\"$LOGS_SERVER/$SILO/$ARCHIVES_DIR\">$LOGS_SERVER/$SILO/$ARCHIVES_DIR</a>" - -mkdir .archives -cd .archives/ || exit 1 - -cat > deploy-archives.xml <<EOF -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>logs</groupId> - <artifactId>logs</artifactId> - <version>1.0.0</version> - <packaging>pom</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.2</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>maven-upload-plugin</artifactId> - <version>0.0.1</version> - <executions> - <execution> - <id>publish-site</id> - <phase>deploy</phase> - <goals> - <goal>upload-file</goal> - </goals> - <configuration> - <serverId>onap-log-archives</serverId> - <repositoryUrl>$LOGS_REPO_URL/content-compressed</repositoryUrl> - <file>archives.zip</file> - <repositoryPath>$SILO</repositoryPath> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> -EOF - -mkdir -p "$ARCHIVES_DIR" -mkdir -p "$WORKSPACE/archives" -if [ ! -z "$ARCHIVE_ARTIFACTS" ]; then - pushd "$WORKSPACE" - shopt -s globstar # Enable globstar to copy archives - for f in $ARCHIVE_ARTIFACTS; do - [[ -e $f ]] || continue # handle the case of no files to archive - echo "Archiving $f" >> "$WORKSPACE/.archives/$ARCHIVES_DIR/_archives.log" - dir=$(dirname "$f") - mkdir -p "$WORKSPACE/archives/$dir" - mv "$f" "$WORKSPACE/archives/$f" - done - shopt -u globstar # Disable globstar once archives are copied - popd -fi - - -# Ignore logging if archives doesn't exist -mv "$WORKSPACE/archives/" "$ARCHIVES_DIR" > /dev/null 2>&1 -touch "$ARCHIVES_DIR/_build-details.txt" -echo "build-url: ${BUILD_URL}" >> "$ARCHIVES_DIR/_build-details.txt" -env | grep -v PASSWORD > "$ARCHIVES_DIR/_build-enviroment-variables.txt" - -# capture system info -touch "$ARCHIVES_DIR/_sys-info.txt" -{ - echo -e "uname -a:\n $(uname -a) \n" - echo -e "df -h:\n $(df -h) \n" - echo -e "free -m:\n $(free -m) \n" - echo -e "nproc:\n $(nproc) \n" - echo -e "lscpu:\n $(lscpu) \n" - echo -e "ip addr:\n $(/sbin/ip addr) \n" -} 2>&1 | tee -a "$ARCHIVES_DIR/_sys-info.txt" - -# Magic string used to trim console logs at the appropriate level during wget -echo "-----END_OF_BUILD-----" -wget -O "$ARCHIVES_DIR/console.log" "${BUILD_URL}consoleText" -wget -O "$ARCHIVES_DIR/console-timestamp.log" "$BUILD_URL/timestamps?time=HH:mm:ss&appendLog" -sed -i '/^-----END_OF_BUILD-----$/,$d' "$ARCHIVES_DIR/console.log" -sed -i '/^.*-----END_OF_BUILD-----$/,$d' "$ARCHIVES_DIR/console-timestamp.log" - -gzip "$ARCHIVES_DIR"/*.txt "$ARCHIVES_DIR"/*.log -# find and gzip any 'text' files -find "$ARCHIVES_DIR" -type f -print0 \ - | xargs -0r file \ - | egrep -e ':.*text.*' \ - | cut -d: -f1 \ - | xargs -d'\n' -r gzip -# Compress Java heap dumps using xz -find "$ARCHIVES_DIR" -type f -name \*.hprof -print0 | xargs -0 xz - -zip -r archives.zip "$JENKINS_HOSTNAME/" >> "$ARCHIVES_DIR/_archives.log" -du -sh archives.zip diff --git a/jjb/include-update-pom-versions-not-parent.sh b/jjb/include-update-pom-versions-not-parent.sh deleted file mode 100644 index ace2350a2..000000000 --- a/jjb/include-update-pom-versions-not-parent.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -## Will update POM in workspace with release version - -if [ ! -e version.properties ]; then - echo "Missing version.properties" - exit 1 -fi - -## will setup variable release_version -source ./version.properties - -RELEASE_VERSION=$release_version - -echo Changing POM version to $RELEASE_VERSION - -## handle POM -for file in $(find . -name pom.xml); do - VERSION=$(xpath -q -e '//project/version/text()' $file) - PVERSION=$(xpath -q -e '//project/parent/version/text()' $file) - echo before changes VERSION=$VERSION PVERSION=$PVERSION file=$file - if [ "$VERSION" != "" ]; then - awk -v v=$RELEASE_VERSION ' - /<version>/ { - if (! done) { - sub(/<version>.*</,"<version>" v "<",$0) - done = 1 - } - } - { print $0 } - ' $file > $file.tmp - mv $file.tmp $file - fi - VERSION=$(xpath -q -e '//project/version/text()' $file) - PVERSION=$(xpath -q -e '//project/parent/version/text()' $file) - echo after changes VERSION=$VERSION PVERSION=$PVERSION file=$file -done - diff --git a/jjb/include-update-pom-versions.sh b/jjb/include-update-pom-versions.sh deleted file mode 100644 index 2d459d03b..000000000 --- a/jjb/include-update-pom-versions.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -## Will update POM in workspace with release version - -if [ ! -e version.properties ]; then - echo "Missing version.properties" - exit 1 -fi - -## will setup variable release_version -source ./version.properties - -RELEASE_VERSION=$release_version - -echo Changing POM version to $RELEASE_VERSION - -## handle POM -for file in $(find . -name pom.xml); do - VERSION=$(xpath -q -e '//project/version/text()' $file) - PVERSION=$(xpath -q -e '//project/parent/version/text()' $file) - echo before changes VERSION=$VERSION PVERSION=$PVERSION file=$file - if [ "$VERSION" != "" ]; then - awk -v v=$RELEASE_VERSION ' - /<version>/ { - if (! done) { - sub(/<version>.*</,"<version>" v "<",$0) - done = 1 - } - } - { print $0 } - ' $file > $file.tmp - mv $file.tmp $file - fi - if [ "$PVERSION" != "" ]; then - awk -v v=$RELEASE_VERSION ' - /<version>/ { - if (parent && ! done) { - sub(/<version>.*</,"<version>" v "<",$0) - done = 1 - } - } - /<parent>/ { parent = 1 } - { print $0 } - ' $file > $file.tmp - mv $file.tmp $file - fi - VERSION=$(xpath -q -e '//project/version/text()' $file) - PVERSION=$(xpath -q -e '//project/parent/version/text()' $file) - echo after changes VERSION=$VERSION PVERSION=$PVERSION file=$file -done - diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml index 39206537a..173dc7176 100644 --- a/jjb/integration/integration-docker.yaml +++ b/jjb/integration/integration-docker.yaml @@ -3,8 +3,8 @@ name: integration-docker project-name: 'integration' jobs: - - '{project-name}-{stream}-{subproject}-docker-merge' - - '{project-name}-{stream}-{subproject}-docker-verify' + - integration-docker-merge + - integration-docker-verify project: 'integration' stream: - 'master': diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml index e434d0a7b..dd7c05d20 100644 --- a/jjb/integration/integration-templates-docker.yaml +++ b/jjb/integration/integration-templates-docker.yaml @@ -1,9 +1,11 @@ --- - job-template: name: '{project-name}-{stream}-{subproject}-docker-merge' + id: integration-docker-merge project-type: freestyle node: 'ubuntu1804-docker-8c-8g' docker-image-name: '' + mvn-goals: 'clean package docker:build docker:push' properties: - infra-properties: @@ -38,7 +40,6 @@ files: '{pattern}' builders: - - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -48,7 +49,7 @@ - maven-target: maven-version: '{maven-version}' pom: '{pom}' - goals: 'clean package docker:build docker:push' + goals: '{mvn-goals}' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -63,9 +64,11 @@ - job-template: name: '{project-name}-{stream}-{subproject}-docker-verify' + id: integration-docker-verify project-type: freestyle node: 'ubuntu1804-docker-8c-8g' docker-image-name: '' + mvn-goals: 'clean package docker:build' properties: - infra-properties: @@ -100,7 +103,6 @@ files: '{pattern}' builders: - - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -110,7 +112,7 @@ - maven-target: maven-version: '{maven-version}' pom: '{pom}' - goals: 'clean package docker:build' + goals: '{mvn-goals}' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -123,7 +125,6 @@ - infra-shiplogs: maven-version: '{maven-version}' - - job-template: name: '{project-name}-{stream}-{subproject}-docker-compose-verify' id: integration-docker-compose-verify diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index 58bab20a6..cb70a0819 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -24,26 +24,9 @@ project: 'testsuite' - extra-project1: 'testsuite/python-testing-utils' - extra-branch1: '{branch}' - extra-refspec1: 'refs/heads/{branch}' - checkout-dir1: 'testsuite/eteutils' - - extra-project2: 'testsuite/heatbridge' - extra-branch2: '{branch}' - extra-refspec2: 'refs/heads/{branch}' - checkout-dir2: 'testsuite/heatbridge' - - extra-project3: 'demo' - extra-branch3: '{branch}' - extra-refspec3: 'refs/heads/{branch}' - checkout-dir3: 'demo' - stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' - 'elalto': branch: 'elalto' mvn-settings: 'testsuite-settings' |