From e2a74cef07236f07a0dbc0507b824a0faf344d7b Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Wed, 28 Oct 2020 08:40:20 +0000 Subject: [PATCH] eiffel: Switch build job triggers to GitHub trigger The jobs were created to run periodically to settle the basics and gather feedback from the projects. ETOS project prefers the builds to be run upon merge of the commits and this seems to be useful for other projects as well so the jobs are modified to run based on GitHub triggers. Jobs are renamed to reflect the fact as well. Next change in the series enables posting comments back to PR if the job is triggered due to merge of a PR. Change-Id: I59a32c567def96550ee2297a985694f894339a85 --- jjb/eiffel/eiffel-gerrit-herald.yaml | 4 +- jjb/eiffel/eiffel-intelligence-frontend.yaml | 4 +- jjb/eiffel/eiffel-intelligence.yaml | 4 +- jjb/eiffel/eiffel-remrem-generate.yaml | 4 +- jjb/eiffel/eiffel-remrem-publish.yaml | 4 +- jjb/eiffel/etos-api.yaml | 4 +- .../etos-environment-provider-worker.yaml | 4 +- jjb/eiffel/etos-environment-provider.yaml | 4 +- jjb/eiffel/etos-suite-runner.yaml | 4 +- jjb/eiffel/etos-suite-starter.yaml | 4 +- .../etos-test-runner-containers-base.yaml | 2 +- .../etos-test-runner-containers-go.yaml | 2 +- .../etos-test-runner-containers-python.yaml | 2 +- .../etos-test-runner-containers-rust.yaml | 2 +- .../global-eiffel-container-build-merge.yaml | 12 ++-- jjb/eiffel/macros/eiffel-macros.yaml | 24 +++----- jjb/eiffel/scripts/eiffel-build-periodic.sh | 60 ------------------- ...=> eiffel-intelligence-container-build.sh} | 0 ...-intelligence-frontend-container-build.sh} | 0 ...eiffel-remrem-generate-container-build.sh} | 0 ... eiffel-remrem-publish-container-build.sh} | 0 21 files changed, 37 insertions(+), 107 deletions(-) delete mode 100644 jjb/eiffel/scripts/eiffel-build-periodic.sh rename jjb/eiffel/scripts/{eiffel-intelligence-build-periodic.sh => eiffel-intelligence-container-build.sh} (100%) rename jjb/eiffel/scripts/{eiffel-intelligence-frontend-build-periodic.sh => eiffel-intelligence-frontend-container-build.sh} (100%) rename jjb/eiffel/scripts/{eiffel-remrem-generate-build-periodic.sh => eiffel-remrem-generate-container-build.sh} (100%) rename jjb/eiffel/scripts/{eiffel-remrem-publish-build-periodic.sh => eiffel-remrem-publish-container-build.sh} (100%) diff --git a/jjb/eiffel/eiffel-gerrit-herald.yaml b/jjb/eiffel/eiffel-gerrit-herald.yaml index 84aa46b3..f0d79684 100644 --- a/jjb/eiffel/eiffel-gerrit-herald.yaml +++ b/jjb/eiffel/eiffel-gerrit-herald.yaml @@ -29,7 +29,7 @@ - 'master': branch: 'master' project-git-repo: '{project}' - project-build-macro: 'eiffel-build-periodic-macro' + project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'Dockerfile' image-name: '{project}' image-tag: 'dev' @@ -37,6 +37,6 @@ distro: ubuntu2004 jobs: - - '{project-name}-build-periodic-{distro}-{stream}' + - '{project-name}-build-merge-{distro}-{stream}' # vim: set ts=2 sw=2 expandtab: diff --git a/jjb/eiffel/eiffel-intelligence-frontend.yaml b/jjb/eiffel/eiffel-intelligence-frontend.yaml index c427ba0d..e50d6944 100644 --- a/jjb/eiffel/eiffel-intelligence-frontend.yaml +++ b/jjb/eiffel/eiffel-intelligence-frontend.yaml @@ -29,7 +29,7 @@ - 'master': branch: 'master' project-git-repo: '{project}' - project-build-macro: 'eiffel-intelligence-frontend-build-periodic-macro' + project-build-macro: 'eiffel-intelligence-frontend-container-build-macro' image-dockerfile: 'src/main/docker/Dockerfile' image-name: '{project}' image-tag: 'dev' @@ -37,6 +37,6 @@ distro: ubuntu2004 jobs: - - '{project-name}-build-periodic-{distro}-{stream}' + - '{project-name}-build-merge-{distro}-{stream}' # vim: set ts=2 sw=2 expandtab: diff --git a/jjb/eiffel/eiffel-intelligence.yaml b/jjb/eiffel/eiffel-intelligence.yaml index c4941c2f..7f941960 100644 --- a/jjb/eiffel/eiffel-intelligence.yaml +++ b/jjb/eiffel/eiffel-intelligence.yaml @@ -29,7 +29,7 @@ - 'master': branch: 'master' project-git-repo: '{project}' - project-build-macro: 'eiffel-intelligence-build-periodic-macro' + project-build-macro: 'eiffel-intelligence-container-build-macro' image-dockerfile: 'src/main/docker/Dockerfile' image-name: '{project}' image-tag: 'dev' @@ -37,6 +37,6 @@ distro: ubuntu2004 jobs: - - '{project-name}-build-periodic-{distro}-{stream}' + - '{project-name}-build-merge-{distro}-{stream}' # vim: set ts=2 sw=2 expandtab: diff --git a/jjb/eiffel/eiffel-remrem-generate.yaml b/jjb/eiffel/eiffel-remrem-generate.yaml index 7a17547a..54e08091 100644 --- a/jjb/eiffel/eiffel-remrem-generate.yaml +++ b/jjb/eiffel/eiffel-remrem-generate.yaml @@ -29,7 +29,7 @@ - 'master': branch: 'master' project-git-repo: '{project}' - project-build-macro: 'eiffel-remrem-generate-build-periodic-macro' + project-build-macro: 'eiffel-remrem-generate-container-build-macro' image-dockerfile: 'src/main/docker/Dockerfile' image-name: '{project}' image-tag: 'dev' @@ -37,6 +37,6 @@ distro: ubuntu2004 jobs: - - '{project-name}-build-periodic-{distro}-{stream}' + - '{project-name}-build-merge-{distro}-{stream}' # vim: set ts=2 sw=2 expandtab: diff --git a/jjb/eiffel/eiffel-remrem-publish.yaml b/jjb/eiffel/eiffel-remrem-publish.yaml index d4617696..1bcd7366 100644 --- a/jjb/eiffel/eiffel-remrem-publish.yaml +++ b/jjb/eiffel/eiffel-remrem-publish.yaml @@ -29,7 +29,7 @@ - 'master': branch: 'master' project-git-repo: '{project}' - project-build-macro: 'eiffel-remrem-publish-build-periodic-macro' + project-build-macro: 'eiffel-remrem-publish-container-build-macro' image-dockerfile: 'src/main/docker/Dockerfile' image-name: '{project}' image-tag: 'dev' @@ -37,6 +37,6 @@ distro: ubuntu2004 jobs: - - '{project-name}-build-periodic-{distro}-{stream}' + - '{project-name}-build-merge-{distro}-{stream}' # vim: set ts=2 sw=2 expandtab: diff --git a/jjb/eiffel/etos-api.yaml b/jjb/eiffel/etos-api.yaml index e02ae1b3..95095d34 100644 --- a/jjb/eiffel/etos-api.yaml +++ b/jjb/eiffel/etos-api.yaml @@ -29,7 +29,7 @@ - 'master': branch: 'master' project-git-repo: '{project}' - project-build-macro: 'eiffel-build-periodic-macro' + project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'Dockerfile' image-name: '{project}' image-tag: 'dev' @@ -37,6 +37,6 @@ distro: ubuntu2004 jobs: - - '{project-name}-build-periodic-{distro}-{stream}' + - '{project-name}-build-merge-{distro}-{stream}' # vim: set ts=2 sw=2 expandtab: diff --git a/jjb/eiffel/etos-environment-provider-worker.yaml b/jjb/eiffel/etos-environment-provider-worker.yaml index a2900fcf..bd53d6c4 100644 --- a/jjb/eiffel/etos-environment-provider-worker.yaml +++ b/jjb/eiffel/etos-environment-provider-worker.yaml @@ -28,7 +28,7 @@ - 'master': branch: 'master' project-git-repo: 'etos-environment-provider' - project-build-macro: 'eiffel-build-periodic-macro' + project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'Dockerfile.workers' image-name: '{project}' image-tag: 'dev' @@ -36,6 +36,6 @@ distro: ubuntu2004 jobs: - - '{project-name}-build-periodic-{distro}-{stream}' + - '{project-name}-build-merge-{distro}-{stream}' # vim: set ts=2 sw=2 expandtab: diff --git a/jjb/eiffel/etos-environment-provider.yaml b/jjb/eiffel/etos-environment-provider.yaml index 4ad0735a..34a93c7f 100644 --- a/jjb/eiffel/etos-environment-provider.yaml +++ b/jjb/eiffel/etos-environment-provider.yaml @@ -29,7 +29,7 @@ - 'master': branch: 'master' project-git-repo: '{project}' - project-build-macro: 'eiffel-build-periodic-macro' + project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'Dockerfile' image-name: '{project}' image-tag: 'dev' @@ -37,6 +37,6 @@ distro: ubuntu2004 jobs: - - '{project-name}-build-periodic-{distro}-{stream}' + - '{project-name}-build-merge-{distro}-{stream}' # vim: set ts=2 sw=2 expandtab: diff --git a/jjb/eiffel/etos-suite-runner.yaml b/jjb/eiffel/etos-suite-runner.yaml index 6e4ceb5d..72cf15b9 100644 --- a/jjb/eiffel/etos-suite-runner.yaml +++ b/jjb/eiffel/etos-suite-runner.yaml @@ -29,7 +29,7 @@ - 'master': branch: 'master' project-git-repo: '{project}' - project-build-macro: 'eiffel-build-periodic-macro' + project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'Dockerfile' image-name: '{project}' image-tag: 'dev' @@ -37,6 +37,6 @@ distro: ubuntu2004 jobs: - - '{project-name}-build-periodic-{distro}-{stream}' + - '{project-name}-build-merge-{distro}-{stream}' # vim: set ts=2 sw=2 expandtab: diff --git a/jjb/eiffel/etos-suite-starter.yaml b/jjb/eiffel/etos-suite-starter.yaml index c4b6f401..5e6ba2ba 100644 --- a/jjb/eiffel/etos-suite-starter.yaml +++ b/jjb/eiffel/etos-suite-starter.yaml @@ -29,7 +29,7 @@ - 'master': branch: 'master' project-git-repo: '{project}' - project-build-macro: 'eiffel-build-periodic-macro' + project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'Dockerfile' image-name: '{project}' image-tag: 'dev' @@ -37,6 +37,6 @@ distro: ubuntu2004 jobs: - - '{project-name}-build-periodic-{distro}-{stream}' + - '{project-name}-build-merge-{distro}-{stream}' # vim: set ts=2 sw=2 expandtab: diff --git a/jjb/eiffel/etos-test-runner-containers-base.yaml b/jjb/eiffel/etos-test-runner-containers-base.yaml index 4f16a6f6..37eb8aa8 100644 --- a/jjb/eiffel/etos-test-runner-containers-base.yaml +++ b/jjb/eiffel/etos-test-runner-containers-base.yaml @@ -29,7 +29,7 @@ - 'master': branch: 'master' project-git-repo: 'etos-test-runner-containers' - project-build-macro: 'eiffel-build-periodic-macro' + project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'base/Dockerfile' image-name: 'etos-base-test-runner' image-tag: 'dev' diff --git a/jjb/eiffel/etos-test-runner-containers-go.yaml b/jjb/eiffel/etos-test-runner-containers-go.yaml index 86ff2300..ca662012 100644 --- a/jjb/eiffel/etos-test-runner-containers-go.yaml +++ b/jjb/eiffel/etos-test-runner-containers-go.yaml @@ -29,7 +29,7 @@ - 'master': branch: 'master' project-git-repo: 'etos-test-runner-containers' - project-build-macro: 'eiffel-build-periodic-macro' + project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'go/Dockerfile' image-name: 'etos-go-test-runner' image-tag: 'dev' diff --git a/jjb/eiffel/etos-test-runner-containers-python.yaml b/jjb/eiffel/etos-test-runner-containers-python.yaml index db334784..ba184b8d 100644 --- a/jjb/eiffel/etos-test-runner-containers-python.yaml +++ b/jjb/eiffel/etos-test-runner-containers-python.yaml @@ -29,7 +29,7 @@ - 'master': branch: 'master' project-git-repo: 'etos-test-runner-containers' - project-build-macro: 'eiffel-build-periodic-macro' + project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'python/Dockerfile' image-name: 'etos-python-test-runner' image-tag: 'dev' diff --git a/jjb/eiffel/etos-test-runner-containers-rust.yaml b/jjb/eiffel/etos-test-runner-containers-rust.yaml index 2fa7e12a..a47154a0 100644 --- a/jjb/eiffel/etos-test-runner-containers-rust.yaml +++ b/jjb/eiffel/etos-test-runner-containers-rust.yaml @@ -29,7 +29,7 @@ - 'master': branch: 'master' project-git-repo: 'etos-test-runner-containers' - project-build-macro: 'eiffel-build-periodic-macro' + project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'rust/Dockerfile' image-name: 'etos-rust-test-runner' image-tag: 'dev' diff --git a/jjb/eiffel/global-eiffel-container-build-merge.yaml b/jjb/eiffel/global-eiffel-container-build-merge.yaml index 70596af7..04d46f43 100644 --- a/jjb/eiffel/global-eiffel-container-build-merge.yaml +++ b/jjb/eiffel/global-eiffel-container-build-merge.yaml @@ -29,7 +29,9 @@ properties: - logrotate - github: - url: '$GIT_BASE_HTTPS/{project-git-repo}' + # NOTE (fdegir): url is hardcoded here since env vars in job properties + # do not seem to be resolved correctly, causing job no to function properly + url: 'https://github.com/eiffel-community/{project-git-repo}' parameters: - project-parameters: @@ -39,10 +41,6 @@ name: GIT_BASE_HTTPS default: https://github.com/eiffel-community description: HTTPS URL of Project Repo on GitHub to clone repo. - - string: - name: GIT_BASE_SSH - default: git@github.com:eiffel-community - description: SSH URL of Project Repo on GitHub to clone repo. - string: name: IMAGE_DOCKERFILE default: '{image-dockerfile}' @@ -78,7 +76,7 @@ scm: - git: - url: '$GIT_BASE_HTTPS/{project-git-repo}.git' + url: 'https://github.com/eiffel-community/{project-git-repo}.git' branches: - '*/{branch}' refspec: '' @@ -105,7 +103,7 @@ - nordixinfra-harbor-creds-wrapper - mask-passwords - openstack: - single-use: True + single-use: true builders: - '{project-build-macro}' diff --git a/jjb/eiffel/macros/eiffel-macros.yaml b/jjb/eiffel/macros/eiffel-macros.yaml index 994d4b16..6c339bfc 100644 --- a/jjb/eiffel/macros/eiffel-macros.yaml +++ b/jjb/eiffel/macros/eiffel-macros.yaml @@ -5,36 +5,28 @@ - shell: !include-raw: ../scripts/eiffel-global-container-build.sh -# NOTE (fdegir): below macros will potentially be removed or renamed -# once the above macro is taken into use - builder: - name: 'eiffel-build-periodic-macro' + name: 'eiffel-intelligence-container-build-macro' builders: - shell: - !include-raw: ../scripts/eiffel-build-periodic.sh + !include-raw: ../scripts/eiffel-intelligence-container-build.sh - builder: - name: 'eiffel-intelligence-build-periodic-macro' + name: 'eiffel-intelligence-frontend-container-build-macro' builders: - shell: - !include-raw: ../scripts/eiffel-intelligence-build-periodic.sh + !include-raw: ../scripts/eiffel-intelligence-frontend-container-build.sh - builder: - name: 'eiffel-intelligence-frontend-build-periodic-macro' + name: 'eiffel-remrem-generate-container-build-macro' builders: - shell: - !include-raw: ../scripts/eiffel-intelligence-frontend-build-periodic.sh + !include-raw: ../scripts/eiffel-remrem-generate-container-build.sh - builder: - name: 'eiffel-remrem-generate-build-periodic-macro' + name: 'eiffel-remrem-publish-container-build-macro' builders: - shell: - !include-raw: ../scripts/eiffel-remrem-generate-build-periodic.sh - -- builder: - name: 'eiffel-remrem-publish-build-periodic-macro' - builders: - - shell: - !include-raw: ../scripts/eiffel-remrem-publish-build-periodic.sh + !include-raw: ../scripts/eiffel-remrem-publish-container-build.sh # vim: set ts=2 sw=2 expandtab: diff --git a/jjb/eiffel/scripts/eiffel-build-periodic.sh b/jjb/eiffel/scripts/eiffel-build-periodic.sh deleted file mode 100644 index 7f9e6a3c..00000000 --- a/jjb/eiffel/scripts/eiffel-build-periodic.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -# ============LICENSE_START======================================================= -# Copyright (C) 2020 The Nordix Foundation. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= - -set -o errexit -set -o pipefail -set -o nounset - -# navigate to root of the git clone -cd "$WORKSPACE" - -# the Dockerfile to use for building the container image -IMAGE_DOCKERFILE="${IMAGE_DOCKERFILE:?IMAGE_DOCKERFILE is unset!}" - -# the name of the container image -IMAGE_NAME="${IMAGE_NAME:?IMAGE_NAME is unset!}" - -# the tag to apply to the container image -IMAGE_TAG="${IMAGE_TAG:-latest}" - -# set image name -IMAGE_NAME_TAG="$NORDIX_REGISTRY/$HARBOR_EIFFEL_PROJECT/$IMAGE_NAME:$IMAGE_TAG" - -# set the build command so we can log it to console -PODMAN_BUILD_CMD="podman build --file $IMAGE_DOCKERFILE --log-level $PODMAN_LOG_LEVEL --tag $IMAGE_NAME_TAG ." - -echo "Info : Building the container image with the command" -echo " $PODMAN_BUILD_CMD" -echo "----------------------------------------------------------------" -$PODMAN_BUILD_CMD -echo "----------------------------------------------------------------" -echo "Info : Build successful! List of container images is" -echo "----------------------------------------------------------------" -podman images --log-level $PODMAN_LOG_LEVEL -echo "----------------------------------------------------------------" -echo "Info : Logging in to registry.nordix.org and pushing the image" -echo "----------------------------------------------------------------" -podman login --log-level "$PODMAN_LOG_LEVEL" "$NORDIX_REGISTRY" --username "$HARBOR_USERNAME" --password "$HARBOR_PASSWORD" -podman push --log-level "$PODMAN_LOG_LEVEL" "$IMAGE_NAME_TAG" -podman logout --log-level "$PODMAN_LOG_LEVEL" "$NORDIX_REGISTRY" -echo "----------------------------------------------------------------" -echo "Info : Done!" - -# vim: set ts=2 sw=2 expandtab: diff --git a/jjb/eiffel/scripts/eiffel-intelligence-build-periodic.sh b/jjb/eiffel/scripts/eiffel-intelligence-container-build.sh similarity index 100% rename from jjb/eiffel/scripts/eiffel-intelligence-build-periodic.sh rename to jjb/eiffel/scripts/eiffel-intelligence-container-build.sh diff --git a/jjb/eiffel/scripts/eiffel-intelligence-frontend-build-periodic.sh b/jjb/eiffel/scripts/eiffel-intelligence-frontend-container-build.sh similarity index 100% rename from jjb/eiffel/scripts/eiffel-intelligence-frontend-build-periodic.sh rename to jjb/eiffel/scripts/eiffel-intelligence-frontend-container-build.sh diff --git a/jjb/eiffel/scripts/eiffel-remrem-generate-build-periodic.sh b/jjb/eiffel/scripts/eiffel-remrem-generate-container-build.sh similarity index 100% rename from jjb/eiffel/scripts/eiffel-remrem-generate-build-periodic.sh rename to jjb/eiffel/scripts/eiffel-remrem-generate-container-build.sh diff --git a/jjb/eiffel/scripts/eiffel-remrem-publish-build-periodic.sh b/jjb/eiffel/scripts/eiffel-remrem-publish-container-build.sh similarity index 100% rename from jjb/eiffel/scripts/eiffel-remrem-publish-build-periodic.sh rename to jjb/eiffel/scripts/eiffel-remrem-publish-container-build.sh -- 2.25.1