From: Eric Ball Date: Wed, 12 Apr 2023 15:22:41 +0000 (+0000) Subject: Merge "Automation adds sdt.yaml" X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=3369e2099a04824a0e3b7c9046e334e0fdae05c4;hp=94e70564af3b015b0de4a71379ca52c4e2621ed0 Merge "Automation adds sdt.yaml" --- diff --git a/global-jjb b/global-jjb index 77f06cb..02860f8 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 77f06cb5e687962c7f999c80fbcf2a6b31042afd +Subproject commit 02860f86d24223854948d1d13a91a77496e7bd0f diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg index c00655a..d937357 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132154.275 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220916-133811.046 HARDWARE_ID=v3-standard-1 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg index 6a226f9..9567b98 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132154.275 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220916-133811.046 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg index 46f55aa..aa816c6 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132154.275 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220916-133811.046 HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg index fd9ede5..6429fff 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132154.275 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220916-133811.046 HARDWARE_ID=v3-standard-32 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg index 82e2ceb..32d2e20 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132154.275 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220916-133811.046 HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg index d643f68..0234d7b 100644 --- a/jenkins-config/clouds/openstack/cattle/cloud.cfg +++ b/jenkins-config/clouds/openstack/cattle/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 - 20211001-132154.275 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220916-133811.046 HARDWARE_ID=v3-standard-1 NETWORK_ID=e84c8d94-1d74-4593-b24f-9a091cd3b9bf USER_DATA_ID=jenkins-init-script diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu18.04-docker-arm64-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu18.04-docker-arm64-8c-8g.cfg index 88edd24..3bde2fb 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu18.04-docker-arm64-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu18.04-docker-arm64-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20191204-002552.777 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20220919-212209.052 HARDWARE_ID=v3-standard-8 LABELS=aarch64_build aarch64_dev diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg index de69ee9..10714bb 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210401-001638.539 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220916-133907.553 HARDWARE_ID=v3-starter-8 diff --git a/jenkins-config/managed-config-files/custom/ansible-cfg/config-params.yaml b/jenkins-config/managed-config-files/custom/ansible-cfg/config-params.yaml new file mode 100644 index 0000000..d6dcf71 --- /dev/null +++ b/jenkins-config/managed-config-files/custom/ansible-cfg/config-params.yaml @@ -0,0 +1,3 @@ +--- +name: "ansible.cfg" +comment: "ansible config file" diff --git a/jenkins-config/managed-config-files/custom/ansible-cfg/content b/jenkins-config/managed-config-files/custom/ansible-cfg/content new file mode 100644 index 0000000..96c9117 --- /dev/null +++ b/jenkins-config/managed-config-files/custom/ansible-cfg/content @@ -0,0 +1,2 @@ +[defaults] +remote_tmp = ~/.ansible/tmp diff --git a/jjb/akraino-templates/akraino-jjb-docker.yaml b/jjb/akraino-templates/akraino-jjb-docker.yaml index 8c6911c..8e068d5 100644 --- a/jjb/akraino-templates/akraino-jjb-docker.yaml +++ b/jjb/akraino-templates/akraino-jjb-docker.yaml @@ -53,6 +53,9 @@ triggers: - timed: '@daily' + publishers: + - lf-infra-publish + - job-template: id: 'akraino-project-stream-stage-docker' name: '{project-name}-{stream}-stage-docker' @@ -99,3 +102,6 @@ jobs: - '{project}-maven-stage-{stream}' - 'yaml_builds-{stream}-stage-config' + + publishers: + - lf-infra-publish diff --git a/jjb/akraino-templates/akraino-jjb-templates.yaml b/jjb/akraino-templates/akraino-jjb-templates.yaml index 52d4901..ed7e8f0 100644 --- a/jjb/akraino-templates/akraino-jjb-templates.yaml +++ b/jjb/akraino-templates/akraino-jjb-templates.yaml @@ -402,3 +402,6 @@ export SWAP_SIZE=0 sudo -E ./global-jjb/jenkins-init-scripts/init.sh sudo chown jenkins:jenkins -R archives + + publishers: + - lf-infra-publish diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml index 58f92cd..be0a956 100644 --- a/jjb/akraino-templates/akraino-ta-common-macros.yaml +++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml @@ -389,6 +389,7 @@ - publisher: name: ta-publisher-job-merge publishers: + - lf-infra-publish - ta-publisher-ci-build: arch: '{arch}' - trigger-parameterized-builds: diff --git a/jjb/akraino-templates/akraino-validation-templates.yaml b/jjb/akraino-templates/akraino-validation-templates.yaml index 4cd18a8..cb74915 100644 --- a/jjb/akraino-templates/akraino-validation-templates.yaml +++ b/jjb/akraino-templates/akraino-validation-templates.yaml @@ -43,6 +43,7 @@ <<: *docker-build-job-settings publishers: + - lf-infra-publish - email: recipients: > cristina.pauna@enea.com @@ -88,6 +89,9 @@ make -k -C docker push-all docker system prune -af + publishers: + - lf-infra-publish + - job-template: id: akraino-validation-docker-manifest name: 'validation-docker-manifest-{stream}' @@ -110,6 +114,9 @@ if [ "{branch}" != "{stream}" ]; then export TAG_VER=$STREAM; fi for sd in docker/*/.; do make -k -C $sd .push_manifest; done + publishers: + - lf-infra-publish + - job-template: id: akraino-validation-lab-daily name: 'validation-{validation_lab}-daily-{stream}' @@ -126,6 +133,9 @@ current-parameters: true block: true + publishers: + - lf-infra-publish + - job-template: id: bluval-run-daily-tests name: 'bluval-daily-{stream}' @@ -158,6 +168,7 @@ - ../shell/run_bluval.sh publishers: + - lf-infra-publish - robot: output-path: 'results' report-html: '**/report.html' diff --git a/jjb/ci-management/ci-jobs.yaml b/jjb/ci-management/ci-jobs.yaml index 212fa90..e1ba32a 100644 --- a/jjb/ci-management/ci-jobs.yaml +++ b/jjb/ci-management/ci-jobs.yaml @@ -12,7 +12,7 @@ project: ci-management project-name: ci-management build-node: centos7-builder-2c-1g - jjb-version: 2.9.1 + jjb-version: 4.1.0 views: - project-view diff --git a/packer/common-packer b/packer/common-packer index 3dcae18..b8bffd6 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit 3dcae183d810816f31950afbe1fa08fa948e61fe +Subproject commit b8bffd625cbf589079fcfd9ba1a37c91fdc7f99b