Update RPM repo cfg file URL

[releng/builder.git] / jjb / packaging / packaging.yaml

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 127c411f68e11fba5cf7bd3f50ab57b2361f5923..d8f59253445cf9134b2105eae9e6d323288d2384 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -18,6 +18,7 @@
       - boron
       - carbon
       - nitrogen
+      - oxygen
     branch: 'master'
 
 
@@ -73,14 +74,15 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-build-rpm.sh
+      - shell: !include-raw: build-rpm.sh
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
           mvn-version: 'mvn33'
+          maven-repo-url: '$NEXUS_URL/content/repositories/$REPO_ID'
           repo-id: 'opendaylight-{stream}-epel-7-x86_64-devel'
           group-id: 'org.opendaylight.integration-packaging'
-          files-dir: '$WORKSPACE/upload_files'
+          upload-files-dir: '$WORKSPACE/upload_files'
 
     publishers:
       - lf-infra-publish
@@ -141,14 +143,15 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-build-rpm-snap.sh
+      - shell: !include-raw: build-rpm-snap.sh
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
           mvn-version: 'mvn33'
+          maven-repo-url: '$NEXUS_URL/content/repositories/$REPO_ID'
           repo-id: 'opendaylight-{stream}-epel-7-x86_64-devel'
           group-id: 'org.opendaylight.integration-packaging'
-          files-dir: '$WORKSPACE/upload_files'
+          upload-files-dir: '$WORKSPACE/upload_files'
 
     triggers:
       - timed: '@daily'
@@ -172,7 +175,7 @@
       - string:
           name: URL
           # yamllint disable-line rule:line-length
-          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/rpm/example_repo_configs/opendaylight-60-release.repo'
+          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-60-release.repo'
           description: 'Link to .repo or .rpm file'
 
     scm:
@@ -186,19 +189,25 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-install-rpm.sh
-      - shell: !include-raw: include-raw-start-odl.sh
+      - shell: !include-raw: install-rpm.sh
+      - shell: !include-raw: start-odl.sh
       - shell: |
           # Install expect to interact with Karaf shell
           sudo yum install -y expect
           # Install nmap to check status of ODL's SSH port
           sudo yum install -y nmap
       - shell: !include-raw: include-raw-test-karaf.expect
-      - shell: !include-raw: include-raw-stop-odl.sh
+      - shell: !include-raw: stop-odl.sh
 
     publishers:
-      - archive-artifacts:
+      # TODO: Remove the archive publisher
+      #       small data should be stored on logs.opendaylight.org
+      #       large data should be stored on nexus.opendaylight.org
+      - archive:
           artifacts: '**'
+          allow-empty: true
+          fingerprint: true
+          latest-only: true
       - lf-infra-publish
 
 
@@ -217,12 +226,12 @@
       - string:
           name: URL
           # yamllint disable-line rule:line-length
-          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/rpm/example_repo_configs/opendaylight-6-release.repo'
+          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-6-release.repo'
           description: 'Link to .repo or .rpm file'
       - string:
           name: UPGRADE_URL
           # yamllint disable-line rule:line-length
-          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/rpm/example_repo_configs/opendaylight-6-testing.repo'
+          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-6-testing.repo'
           description: 'Link to .repo or .rpm file'
 
     scm:
@@ -236,19 +245,19 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-install-rpm.sh
-      - shell: !include-raw: include-raw-start-odl.sh
+      - shell: !include-raw: install-rpm.sh
+      - shell: !include-raw: start-odl.sh
       - shell: |
           # Install expect to interact with Karaf shell
           sudo yum install -y expect
           # Install nmap to check status of ODL's SSH port
           sudo yum install -y nmap
       - shell: !include-raw: include-raw-test-karaf.expect
-      - shell: !include-raw: include-raw-stop-odl.sh
-      - shell: !include-raw: include-raw-test-rpm-upgrade.sh
-      - shell: !include-raw: include-raw-start-odl.sh
+      - shell: !include-raw: stop-odl.sh
+      - shell: !include-raw: test-rpm-upgrade.sh
+      - shell: !include-raw: start-odl.sh
       - shell: !include-raw: include-raw-test-karaf.expect
-      - shell: !include-raw: include-raw-stop-odl.sh
+      - shell: !include-raw: stop-odl.sh
 
     publishers:
       - lf-infra-publish
@@ -282,15 +291,15 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-install-deb.sh
-      - shell: !include-raw: include-raw-start-odl.sh
+      - shell: !include-raw: install-deb.sh
+      - shell: !include-raw: start-odl.sh
       - shell: |
           # Install expect to interact with Karaf shell
           sudo apt-get install -y expect
           # Install nmap to check status of ODL's SSH port
           sudo apt-get install -y nmap
       - shell: !include-raw: include-raw-test-karaf.expect
-      - shell: !include-raw: include-raw-stop-odl.sh
+      - shell: !include-raw: stop-odl.sh
 
     publishers:
       - lf-infra-publish
@@ -323,51 +332,11 @@
           mvn-params: '{mvn-params}'
           mvn-version: '{mvn-version}'
           staging-profile-id: ''
-      - string:
-          name: VERSION_MAJOR
-          default: '5'
-          description: 'OpenDaylight major (element) version number to build'
-      - string:
-          name: VERSION_MINOR
-          default: '3'
-          description: 'OpenDaylight minor (SR) version number to build'
-      - string:
-          name: VERSION_PATCH
-          default: '0'
-          description: 'OpenDaylight patch version to build'
-      - string:
-          name: PKG_VERSION
-          default: '1'
-          description: 'Deb version for the given ODL major.minor.patch'
-      - string:
-          name: SYSD_COMMIT
-          default: 'ba1f409c1a46efd068b16ced6ddc8b32a412b03a'
-          description: 'Version of ODL systemd unitfile to download and package in ODL .deb'
-      - string:
-          name: CODENAME
-          default: 'Boron-SR3'
-          description: 'Elemental codename for the ODL release, including SR if applicable'
       - string:
           name: DOWNLOAD_URL
           # yamllint disable-line rule:line-length
           default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.5.3-Boron-SR3/distribution-karaf-0.5.3-Boron-SR3.tar.gz'
           description: 'URL to ODL tarball artifact to repackage into .deb'
-      - string:
-          name: JAVA_VERSION
-          default: '8'
-          description: Java dependency for the ODL release
-      - string:
-          name: JAVA_HOME
-          default: '/usr/lib/jvm/java-8-openjdk-amd64/'
-          description: Set JAVA_HOME to openjdk8
-      - string:
-          name: CHANGELOG_DATE
-          default: 'Mon, 1 Aug 2016'
-          description: 'Date this .deb was defined'
-      - string:
-          name: CHANGELOG_TIME
-          default: '17:48:42 +0530'
-          description: 'Time this .deb was defined'
       - string:
           name: CHANGELOG_NAME
           default: 'Jenkins'
@@ -388,14 +357,15 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-build-deb.sh
+      - shell: !include-raw: build-deb.sh
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
           mvn-version: '{mvn-version}'
+          maven-repo-url: '$NEXUS_URL/content/repositories/$REPO_ID'
           repo-id: 'opendaylight-{stream}-ubuntu-1604-x86_64-devel'
           group-id: 'org.opendaylight.integration-packaging'
-          files-dir: '$WORKSPACE/upload_files'
+          upload-files-dir: '$WORKSPACE/upload_files'
 
     publishers:
       - lf-infra-publish