Merge "adding scheduled attwf build+test job for onlab and manual job"
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 37be9ec..94d103a 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -72,7 +72,7 @@
# matching repos that should be version tagged by the version-tag job
# (basically the same as imagebuilder projects + helm charts + tools
- version-tag-projects-regexp: '^(xos.*|helm-charts|automation-tools|cord-tester|chameleon|rcord|mcord|ecord|acordion|addressmanager|epc-service|exampleservice|fabric|fabric-crossconnect|globalxos|hippie-oss|hss_db|hypercache|internetemulator|kubernetes-service|monitoring|olt-service|onos-service|openstack|progran|sdn-controller|simpleexampleservice|templateservice|vEE|vEG|vBBU|venb|vHSS|vMME|vnaas|vPGWC|vPGWU|vrouter|vsg|vsg-hw|vSGW|vSM|vspgwc|vspgwu|vtn-service|vtr|att-workflow-driver)$'
+ version-tag-projects-regexp: '^(xos.*|helm-charts|automation-tools|cord-tester|chameleon|rcord|mcord|ecord|acordion|addressmanager|epc-service|exampleservice|fabric|fabric-crossconnect|globalxos|hippie-oss|hss_db|hypercache|internetemulator|kubernetes-service|monitoring|olt-service|onos-service|openstack|progran|sdn-controller|simpleexampleservice|templateservice|vEE|vEG|vBBU|venb|vHSS|vMME|vnaas|vPGWC|vPGWU|vrouter|vsg|vsg-hw|vSGW|vSM|vspgwc|vspgwu|vtn-service|vtr|att-workflow-driver|ves-agent)$'
# for matching files with file-include-regexp
all-files-regexp: '.*'
diff --git a/jjb/pipeline/all-xos-api-test-helm.groovy b/jjb/pipeline/all-xos-api-test-helm.groovy
index 4271bad..7d27819 100644
--- a/jjb/pipeline/all-xos-api-test-helm.groovy
+++ b/jjb/pipeline/all-xos-api-test-helm.groovy
@@ -141,8 +141,11 @@
# not indented because heredoc requires it
cat << EOF > $WORKSPACE/xos_tags.yaml
---
-xos_coreImage: 'xosproject/xos-core:\$XOS_VERSION'
-xos_chameleonImage: 'xosproject/chameleon:\$XOS_VERSION'
+images:
+ xos_core:
+ tag: '\$XOS_VERSION'
+ xos_chameleon:
+ tag: '\$XOS_VERSION'
EOF
"""
}
diff --git a/jjb/pipeline/xos-synchronizer-update.groovy b/jjb/pipeline/xos-synchronizer-update.groovy
index 0bd9f92..b02ca11 100644
--- a/jjb/pipeline/xos-synchronizer-update.groovy
+++ b/jjb/pipeline/xos-synchronizer-update.groovy
@@ -137,8 +137,11 @@
# not indented because heredoc requires it
cat << EOF > $WORKSPACE/xos_tags.yaml
---
-xos_coreImage: 'xosproject/xos-core:\$XOS_VERSION'
-xos_chameleonImage: 'xosproject/chameleon:\$XOS_VERSION'
+images:
+ xos_core:
+ tag: '\$XOS_VERSION'
+ xos_chameleon:
+ tag: '\$XOS_VERSION'
EOF
"""
}
diff --git a/jjb/shell/tagcollisionreject.sh b/jjb/shell/tagcollisionreject.sh
index 09c014c..7a2307a 100755
--- a/jjb/shell/tagcollisionreject.sh
+++ b/jjb/shell/tagcollisionreject.sh
@@ -100,9 +100,12 @@
if [[ "${p_version}" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]
then
echo " OK: Parent '$p_image:$p_version' is a released SemVer version"
- elif [[ "${p_version}" =~ ^([0-9]+)\.([0-9]+).*$ ]]
+ elif [[ "${p_version}" =~ ^.*([0-9]+)\.([0-9]+).*$ ]]
then
- # handle the non-SemVer 'ubuntu:16.04' and 'postgres:10.3-alpine' cases
+ # handle non-SemVer versions that have a Major.Minor version specifier in the name
+ # 'ubuntu:16.04'
+ # 'postgres:10.3-alpine'
+ # 'openjdk:8-jre-alpine3.8'
echo " OK: Parent '$p_image:$p_version' is using a non-SemVer, but sufficient, version"
else
echo " ERROR: Parent '$p_image:$p_version' is NOT using an specific version"
diff --git a/jjb/shell/versiontag.sh b/jjb/shell/versiontag.sh
index 60042d8..96e8568 100755
--- a/jjb/shell/versiontag.sh
+++ b/jjb/shell/versiontag.sh
@@ -101,9 +101,12 @@
if [[ "${p_version}" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]
then
echo " OK: Parent '$p_image:$p_version' is a released SemVer version"
- elif [[ "${p_version}" =~ ^([0-9]+)\.([0-9]+).*$ ]]
+ elif [[ "${p_version}" =~ ^.*([0-9]+)\.([0-9]+).*$ ]]
then
- # handle the non-SemVer 'ubuntu:16.04' and 'postgres:10.3-alpine' cases
+ # handle non-SemVer versions that have a Major.Minor version specifier in the name
+ # 'ubuntu:16.04'
+ # 'postgres:10.3-alpine'
+ # 'openjdk:8-jre-alpine3.8'
echo " OK: Parent '$p_image:$p_version' is using a non-SemVer, but sufficient, version"
else
echo " ERROR: Parent '$p_image:$p_version' is NOT using an specific version"
diff --git a/jjb/verify/ves-agent.yaml b/jjb/verify/ves-agent.yaml
index fca6a70..36b755a 100644
--- a/jjb/verify/ves-agent.yaml
+++ b/jjb/verify/ves-agent.yaml
@@ -13,6 +13,8 @@
name: 'verify-ves-agent-jobs'
jobs:
- 'verify-licensed'
+ - 'tag-collision-reject':
+ dependency-jobs: 'verify_ves-agent_licensed'
- 'verify-sonarqube':
dependency-jobs: 'verify_ves-agent_tag-collision'
sonar-prep-commands: './build.sh'