From 6ec6c3c3b6813776e47c6245aa2889954f862e60 Mon Sep 17 00:00:00 2001 From: Tobias Persson Date: Wed, 20 Oct 2021 09:15:17 +0200 Subject: [PATCH] Change default branch to 'main' from 'master' for ETOS Change-Id: Ib2a8b3ea05d930a664f64eb0dfae16d9bfe14a07 --- jjb/eiffel/etos-api.yaml | 4 ++-- jjb/eiffel/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 ++-- jjb/eiffel/etos-test-runner-containers-base.yaml | 4 ++-- jjb/eiffel/etos-test-runner-containers-go.yaml | 4 ++-- jjb/eiffel/etos-test-runner-containers-python.yaml | 4 ++-- jjb/eiffel/etos-test-runner-containers-rust.yaml | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/jjb/eiffel/etos-api.yaml b/jjb/eiffel/etos-api.yaml index 95095d341..d8c6c8380 100644 --- a/jjb/eiffel/etos-api.yaml +++ b/jjb/eiffel/etos-api.yaml @@ -26,8 +26,8 @@ stream: - - 'master': - branch: 'master' + - 'main': + branch: 'main' project-git-repo: '{project}' project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'Dockerfile' diff --git a/jjb/eiffel/etos-environment-provider-worker.yaml b/jjb/eiffel/etos-environment-provider-worker.yaml index bd53d6c4f..5c471f5eb 100644 --- a/jjb/eiffel/etos-environment-provider-worker.yaml +++ b/jjb/eiffel/etos-environment-provider-worker.yaml @@ -25,8 +25,8 @@ project-name: etos-environment-provider-worker stream: - - 'master': - branch: 'master' + - 'main': + branch: 'main' project-git-repo: 'etos-environment-provider' project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'Dockerfile.workers' diff --git a/jjb/eiffel/etos-environment-provider.yaml b/jjb/eiffel/etos-environment-provider.yaml index 34a93c7f3..25c230f07 100644 --- a/jjb/eiffel/etos-environment-provider.yaml +++ b/jjb/eiffel/etos-environment-provider.yaml @@ -26,8 +26,8 @@ stream: - - 'master': - branch: 'master' + - 'main': + branch: 'main' project-git-repo: '{project}' project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'Dockerfile' diff --git a/jjb/eiffel/etos-suite-runner.yaml b/jjb/eiffel/etos-suite-runner.yaml index 72cf15b9e..f70b9d7c5 100644 --- a/jjb/eiffel/etos-suite-runner.yaml +++ b/jjb/eiffel/etos-suite-runner.yaml @@ -26,8 +26,8 @@ stream: - - 'master': - branch: 'master' + - 'main': + branch: 'main' project-git-repo: '{project}' project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'Dockerfile' diff --git a/jjb/eiffel/etos-suite-starter.yaml b/jjb/eiffel/etos-suite-starter.yaml index 5e6ba2ba4..6e0c88084 100644 --- a/jjb/eiffel/etos-suite-starter.yaml +++ b/jjb/eiffel/etos-suite-starter.yaml @@ -26,8 +26,8 @@ stream: - - 'master': - branch: 'master' + - 'main': + branch: 'main' project-git-repo: '{project}' project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'Dockerfile' diff --git a/jjb/eiffel/etos-test-runner-containers-base.yaml b/jjb/eiffel/etos-test-runner-containers-base.yaml index 37eb8aa8c..653b3ec5b 100644 --- a/jjb/eiffel/etos-test-runner-containers-base.yaml +++ b/jjb/eiffel/etos-test-runner-containers-base.yaml @@ -26,8 +26,8 @@ stream: - - 'master': - branch: 'master' + - 'main': + branch: 'main' project-git-repo: 'etos-test-runner-containers' project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'base/Dockerfile' diff --git a/jjb/eiffel/etos-test-runner-containers-go.yaml b/jjb/eiffel/etos-test-runner-containers-go.yaml index ca662012e..7a8d67de4 100644 --- a/jjb/eiffel/etos-test-runner-containers-go.yaml +++ b/jjb/eiffel/etos-test-runner-containers-go.yaml @@ -26,8 +26,8 @@ stream: - - 'master': - branch: 'master' + - 'main': + branch: 'main' project-git-repo: 'etos-test-runner-containers' project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'go/Dockerfile' diff --git a/jjb/eiffel/etos-test-runner-containers-python.yaml b/jjb/eiffel/etos-test-runner-containers-python.yaml index ba184b8d5..fd793a89c 100644 --- a/jjb/eiffel/etos-test-runner-containers-python.yaml +++ b/jjb/eiffel/etos-test-runner-containers-python.yaml @@ -26,8 +26,8 @@ stream: - - 'master': - branch: 'master' + - 'main': + branch: 'main' project-git-repo: 'etos-test-runner-containers' project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'python/Dockerfile' diff --git a/jjb/eiffel/etos-test-runner-containers-rust.yaml b/jjb/eiffel/etos-test-runner-containers-rust.yaml index a47154a0f..18e62915a 100644 --- a/jjb/eiffel/etos-test-runner-containers-rust.yaml +++ b/jjb/eiffel/etos-test-runner-containers-rust.yaml @@ -26,8 +26,8 @@ stream: - - 'master': - branch: 'master' + - 'main': + branch: 'main' project-git-repo: 'etos-test-runner-containers' project-build-macro: 'eiffel-global-container-build-macro' image-dockerfile: 'rust/Dockerfile' -- 2.25.1