X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-ta-common-macros.yaml;h=51095f5ea1180f3b7379e51a20048b9cca5904ec;hb=fac1974adad619e6080042852f19187cdcafb124;hp=33f7f00186fa954f0f117ecd642d8106210e877f;hpb=2fe3188c990b60e5eb25bc2defd80ae8d9167158;p=ci-management.git diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml index 33f7f00..51095f5 100644 --- a/jjb/akraino-templates/akraino-ta-common-macros.yaml +++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml @@ -93,13 +93,17 @@ name: ta-builder-rpm builders: - shell: |2- - sudo yum install -y createrepo - ta/build-tools/build_rpms.sh \ - -m ta/manifest \ - -r ta/rpmbuilder \ - -w work \ - {project-to-build} - find work/ + # Skip RPM build in case no *.spec file is found within the {project-to-build} + if [ -n "$(find {project-to-build} -name '*.spec')" ] + then + sudo yum install -y createrepo + ta/build-tools/build_rpms.sh \ + -m ta/manifest \ + -r ta/rpmbuilder \ + -w work \ + {project-to-build} + find work/ + fi - builder: name: ta-builder-scm @@ -135,6 +139,8 @@ - ../shell/ta-rpm-deploy.sh - shell: !include-raw: - ../../global-jjb/shell/logs-clear-credentials.sh + - inject: + properties-content: 'ALT_NEXUS_URL=' - builder: name: ta-lf-infra-ship-isos @@ -219,6 +225,8 @@ - shell: |2- sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo sudo yum -y install docker-ce docker-ce-cli containerd.io + sudo mkdir -p /etc/docker/ + echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json sudo systemctl start docker # Ugly hack to make docker usable for non-root # (adding to the group would require re-login) @@ -285,9 +293,13 @@ - publisher: name: ta-publisher-job-verify publishers: - - lf-infra-publish + - lf-infra-publish - publisher: name: ta-publisher-job-merge publishers: - - lf-infra-publish + - lf-infra-publish + - trigger-parameterized-builds: + - project: 'ta-ci-build' + condition: UNSTABLE_OR_BETTER + trigger-with-no-params: true