Code Review / releng / builder.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 2: 0a4b518)
Merge changes from topic "update-common-packer"
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Tue, 22 Jun 2021 22:40:39 +0000 (22:40 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 22 Jun 2021 22:40:39 +0000 (22:40 +0000)
* changes:
  Chore: Update common-packer to the latest v0.9.0
  Chore: Update pre-commit config with latest versions

12 files changed:
.pre-commit-config.yaml patch | blob | history
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg patch | blob | history
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg patch | blob | history
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg patch | blob | history
jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg patch | blob | history
jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg patch | blob | history
jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg patch | blob | history
jenkins-config/clouds/openstack/odlvex/cloud.cfg patch | blob | history
jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg patch | blob | history
jjb/defaults.yaml patch | blob | history
jjb/packaging/packaging.yaml [new file with mode: 0644] patch | blob
jjb/transportpce/transportpce.yaml patch | blob | history

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index bb8d8639c3b5751bcd1c31d9b5095692b3922796..a8d275137e1ca9647c83bc4b4d772be7c2b9ce2b 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -47,7 +47,7 @@ repos:
     hooks:
       - id: bandit
         # Bandit does not need to run on test code
-        exclude: tests/*
+        exclude: ^tests/
 
   - repo: https://github.com/pycqa/pydocstyle
     rev: 6.1.1
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
index 7e4888468c068d670a43eae537a09f0a681050e5..19d49cd8a0fa2adcb98e603007a5354973cc0cae 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-1g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
 HARDWARE_ID=v3-standard-2
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
index 3574e52b72a23f9694782ddfa8b931db0bb6c528..5d47f67811751f7f39c41b92abfc84f8ec076846 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-2g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
 HARDWARE_ID=v3-standard-2
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
index c38bb96046051ca01d5d2c1dd14e4f79c22f587d..6cf952749a52d5ca5a98444837450b03ad704880 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
 HARDWARE_ID=v3-standard-2
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
index 7a15b9eb01e5593f0cba615801a1decbe6927580..2c399aaeb645d400d8dff1c2e3445267cf143b53 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-4c-16g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
 HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
index e38ee2904ca4e429fa7f6523af8442261fd05b2f..92d3ff784a40aab15f8f7b165580ee752869f2ea 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-4c-4g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
 HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
index 7e77396d6113bad620fef6b5a81a56870f8d9758..3814e4e4c9efc56e55a1fa92fdafc5507ffc714a 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-8c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
 HARDWARE_ID=v3-standard-8
diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index b53355dd4bc31404afc6474876b489d79f7fbe7f..b21662f9b9d35cb8bc61f9d9e1fe717d8aac6d82 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/cloud.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
@@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
 HARDWARE_ID=v3-standard-2
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
 USER_DATA_ID=jenkins-init-script
diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg
index 01d60e60a2875ad06863bcfd61153881af1f3c72..7ebfed2ea9851d91bd5285e0beec59b33267706a 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=ubuntu1804-mininet-ovs-28-1c-4g
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20210329-150700.140
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20210608-222826.097
 HARDWARE_ID=v3-standard-2
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 86d7cceff2b28d3611db4379f79fa2cfdcffbadc..63b6f381e7e3efb3d672cf32ae54b37632c6a3e5 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -40,6 +40,13 @@
     git-url: "ssh://jenkins-$SILO@git.opendaylight.org:29418"
     lftools-version: <1.0.0
 
+    # Nexus3 docker registries
+    container-public-registry: nexus3.opendaylight.org:10001
+    container-snapshot-registry: nexus3.opendaylight.org:10003
+    container-staging-registry: nexus3.opendaylight.org:10004
+    # the quotes here are REQUIRED
+    container-push-registry: "{container-snapshot-registry}"
+
     # openstack-cron email notification defaults
     failure-notification: "releng+ODL@linuxfoundation.org"
     failure-notification-prefix: "[releng]"
@@ -94,7 +101,7 @@
     # CSIT configuration
     odl_system_count: 1
     odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "v3-standard-4"
@@ -104,9 +111,9 @@
     openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
     tools_system_count: 1
     tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20210329-150700.140"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20210608-222826.097"
     openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20210401-010130.589"
-    openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200813-042753.841"
+    openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20210608-222908.760"
     openstack_queens_system_image: "ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200813-034148.207"
 
     # Default Robot framework options
diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
new file mode 100644 (file)
index 0000000..227671f
--- /dev/null
+++ b/jjb/packaging/packaging.yaml
@@ -0,0 +1,48 @@
+---
+- project:
+    name: packaging-maven-docker-jobs
+    project-name: packaging
+    project: integration/packaging
+    container-public-registry: nexus3.opendaylight.org:10001
+    container-snapshot-registry: nexus3.opendaylight.org:10003
+    container-staging-registry: nexus3.opendaylight.org:10004
+    staging-profile-id: ""
+    mvn-settings: packaging-settings
+    mvn-snapshot-id: packaging-snapshots
+    nexus-snapshot-repo: opendaylight-snapshots
+    tox-dir: "$WORKSPACE"
+    docker-name: odl-docker
+    docker-root: "$WORKSPACE/odl-docker"
+    build-node: centos7-docker-4c-4g
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "$WORKSPACE/.*"
+    jobs:
+      - gerrit-docker-verify:
+          docker-root: "$WORKSPACE"
+          docker-name: "odl-docker"
+          docker-build-args: "-f ./odl-docker/Dockerfile"
+      - gerrit-docker-merge:
+          post_docker_build_script: |
+            #!/bin/bash
+            set -uex -o pipefail
+            set -x
+            DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}}
+            DNAME={container-snapshot-registry}/{docker-name}
+            docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2
+            docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest
+            docker push $DNAME:$DOCKER_IMAGE_TAG2
+            docker push $DNAME:latest
+      - gerrit-maven-docker-stage:
+          mvn-params: "-Dmaven.test.skip install exec:exec -Pbuild-docker"
+          maven-versions-plugin: true
+          sign-artifacts: true
+    stream:
+      - master:
+          branch: "master"
+
+- project:
+    name: packaging-view
+    views:
+      - project-view
+    project-name: packaging
diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index 0c1e5346cc5dd6cd44eae759ffa1cfb8e12e19d0..2f07ab50c1efb377c16fc4db63464cb9d921b2db 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -10,6 +10,7 @@
       - gerrit-tox-verify:
           build-timeout: 240
           build-node: centos7-builder-4c-16g
+          parallel: true
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
Release Engineering Build infrastructure (Jenkins Job Builder, Packer, etc)