Compare commits
4 Commits
agricola_d
...
deploy_whi
| Author | SHA1 | Date | |
|---|---|---|---|
|
6088c8eb2a | ||
|
|
6161624546 | ||
|
1c73229183 | ||
|
|
3e11219575 |
12
Makefile
12
Makefile
@@ -3,13 +3,16 @@ SRC := config/$(basename $(MAIN)).tex
|
||||
DEP := \
|
||||
config/headfoot.tex \
|
||||
config/sourcelst.tex \
|
||||
config/titlepage.tex \
|
||||
content.tex \
|
||||
Makefile
|
||||
|
||||
DEP += $(wildcard ./*.tex)
|
||||
|
||||
all: $(MAIN)
|
||||
|
||||
one_page: $(DEP)
|
||||
@latex config/framework_one_page.tex
|
||||
latex config/framework_one_page.tex
|
||||
dvipdf framework_one_page.dvi framework_one_page.pdf
|
||||
|
||||
clean:
|
||||
rm -f \
|
||||
$(basename $(MAIN)).aux \
|
||||
@@ -17,7 +20,8 @@ clean:
|
||||
$(basename $(MAIN)).log \
|
||||
$(basename $(MAIN)).out \
|
||||
$(basename $(MAIN)).toc \
|
||||
$(MAIN)
|
||||
$(MAIN) \
|
||||
framework_one_page.*
|
||||
|
||||
$(MAIN): $(DEP)
|
||||
@latex $(SRC)
|
||||
|
||||
@@ -40,11 +40,9 @@ citecolor = black]{hyperref}%
|
||||
\pagestyle{scrheadings} % switch on head and foot line
|
||||
\newpage
|
||||
\tableofcontents
|
||||
\listoffigures
|
||||
\listoftables
|
||||
\lstlistoflistings
|
||||
\input{config/headfoot.tex}
|
||||
\newpage
|
||||
\input{content.tex}
|
||||
\lstsetdefault
|
||||
\end{document}
|
||||
|
||||
|
||||
40
config/framework_one_page.tex
Normal file
40
config/framework_one_page.tex
Normal file
@@ -0,0 +1,40 @@
|
||||
\documentclass[a4paper,12pt,oneside]{article}%
|
||||
\usepackage[utf8]{inputenc}%
|
||||
\usepackage[T1]{fontenc}%
|
||||
\usepackage{caption}%
|
||||
\usepackage{placeins}%
|
||||
\usepackage{graphicx}%
|
||||
\usepackage[colorlinks,
|
||||
pdfpagelabels,
|
||||
pdfstartview = FitH,
|
||||
bookmarksopen = true,
|
||||
bookmarksnumbered = true,
|
||||
linkcolor = black,
|
||||
plainpages = false,
|
||||
hypertexnames = false,
|
||||
citecolor = black]{hyperref}%
|
||||
|
||||
\usepackage{amsmath}%
|
||||
\usepackage{amssymb}%
|
||||
\usepackage{amstext}%
|
||||
\usepackage{amsfonts}%
|
||||
\usepackage{mathrsfs}%
|
||||
\usepackage{hyperref}%
|
||||
\usepackage{xcolor}%
|
||||
\usepackage{scrpage2}%
|
||||
|
||||
\newcommand*\euler{\mathrm{e}}
|
||||
%\input{title.tex}
|
||||
\input{config/font.tex}
|
||||
\input{config/sourcelst.tex}
|
||||
|
||||
\begin{document}
|
||||
\clearscrheadfoot
|
||||
\clearscrplain
|
||||
\clearscrheadings
|
||||
\pagestyle{scrheadings} % switch on head and foot line
|
||||
\input{config/headfoot.tex}
|
||||
\lstsetdefault
|
||||
\input{content.tex}
|
||||
\end{document}
|
||||
|
||||
@@ -2,6 +2,6 @@
|
||||
%\ihead{\includegraphics[scale=0.16]{config/novero_logo_web_500px.eps}}
|
||||
\ohead{\today}
|
||||
\setheadsepline{1pt}
|
||||
\ofoot{\pagemark}
|
||||
\setfootsepline{1pt}
|
||||
%\ofoot{\pagemark}
|
||||
%\setfootsepline{1pt}
|
||||
|
||||
|
||||
@@ -1,6 +1,18 @@
|
||||
\usepackage{listings}%
|
||||
\usepackage{courier}%
|
||||
|
||||
\newcommand{\lstsetdefault}
|
||||
{\lstset
|
||||
{
|
||||
language=bash,
|
||||
tabsize=4,
|
||||
frame=single,
|
||||
basicstyle=\ttfamily\small,
|
||||
commentstyle=\color{black},
|
||||
keywordstyle=\color{black}
|
||||
}
|
||||
}
|
||||
|
||||
\newcommand{\lstsetc}
|
||||
{\lstset
|
||||
{
|
||||
|
||||
391
content.tex
391
content.tex
@@ -1,195 +1,216 @@
|
||||
\section{Gitlab workflow} \label{sec:glw}
|
||||
|
||||
\begin{figure}
|
||||
\begin{center}
|
||||
\input{img_gitlab.tex}
|
||||
\caption{Gitlab workflow}
|
||||
\label{fig:gitlab_workflow}
|
||||
\end{center}
|
||||
\end{figure}
|
||||
|
||||
Figure \ref{fig:gitlab_workflow} gives an overview of the gitlab workflow.
|
||||
The workflow is splitted in different phases:\\
|
||||
|
||||
\begin{itemize}
|
||||
\item Implementation phase
|
||||
\item Code freeze
|
||||
\item Release phase
|
||||
\end{itemize}
|
||||
|
||||
For these different phases The continuous integration/delivery system
|
||||
triggers different build stages. For further details please refer to
|
||||
section \ref{sec:ci}.
|
||||
|
||||
\subsection{Implementation phase}
|
||||
|
||||
While in implementation phase every implementation for the next release is
|
||||
done. Every implementation has to be done on a seperate branch. After
|
||||
finishing an implementation the branch it was made on has to be merged back
|
||||
to the master branch. As defined an implementation could be one of:\\
|
||||
|
||||
\begin{itemize}
|
||||
\item Feature
|
||||
\item Fix
|
||||
\end{itemize}
|
||||
|
||||
\subsubsection{Feature implementation}
|
||||
|
||||
A feature is a a new piece of code that implements new functionality into
|
||||
the system.
|
||||
|
||||
\subsubsection{Fix implementation}
|
||||
|
||||
If in any testing phase an issue is detected these issue can be fixed with
|
||||
a fix implementation.
|
||||
|
||||
\subsubsection{Further kinds of implementation}
|
||||
|
||||
Beside these defined implementations any other kind of implementation is
|
||||
possible but has to be made also on a seperate branch.
|
||||
|
||||
\subsection{Code freeze}
|
||||
|
||||
The transition between implementation phase and release phase is called
|
||||
code freeze. Code freeze means each for the upcoming release planned
|
||||
feature is implemented and merged to the main branch (normally master) of
|
||||
the project's git repository (see figure \ref{fig:gitlab_workflow}). For
|
||||
the upcoming release a "\texttt{release/...}" named branch is created.
|
||||
For a proper release configuration it is necessary to configure the ci
|
||||
build job before creating the release branch (see section \ref{sec:ci_conf})
|
||||
.
|
||||
|
||||
\subsection{Release phase}
|
||||
|
||||
Any release relevant issue that is detected while release phase has to be
|
||||
fixed at the release branch. The release phase is splitted into different
|
||||
stages:
|
||||
|
||||
\begin{itemize}
|
||||
\item Internal release(s)
|
||||
\item External release
|
||||
\end{itemize}
|
||||
|
||||
\subsubsection{Internal release(s)}
|
||||
|
||||
Each push to a release branch triggers the creation of an internal release.
|
||||
Only internal releases must be used to system test the release branch. For
|
||||
details please refer to section \ref{sec:ci_int}.
|
||||
|
||||
\subsubsection{External release}
|
||||
|
||||
If no further release relevant issues could be found (or are accepted as
|
||||
known issues) an external release is created by tagging the commit which
|
||||
should be delivered to the customer. For details please refer to section
|
||||
\ref{sec:ci_ext}.
|
||||
|
||||
\section{Continuous integration/delivery} \label{sec:ci}
|
||||
|
||||
As continuous integration system the gitlab built in ci-system
|
||||
\textit{gitlab-ci} is used. Beside the most important task of ci, ensure
|
||||
constant high code quality, the ci system is used for various tasks:
|
||||
|
||||
\FloatBarrier
|
||||
\begin{itemize}
|
||||
\item Automated static code analysis
|
||||
\item Automated build
|
||||
\item Automated test (not implemented yet)
|
||||
\item Internal release deployment
|
||||
\item External release deployment
|
||||
\item Automated release note generation (not implemented yet)
|
||||
\end{itemize}
|
||||
\FloatBarrier
|
||||
|
||||
\subsection{Internal release deployment} \label{sec:ci_int}
|
||||
|
||||
\begin{figure}
|
||||
\begin{center}
|
||||
\input{img_deploy.tex}
|
||||
\caption{Deployment of release candidats and releases}
|
||||
\label{fig:deployment}
|
||||
\end{center}
|
||||
\end{figure}
|
||||
|
||||
For a branch named \texttt{release/...} the creation of a release candidate
|
||||
is triggered automatically. Figure \ref{fig:deployment} illustrates the
|
||||
deployment process. The internal release is processing the following steps:
|
||||
\\
|
||||
|
||||
\section{Bootloader}
|
||||
To build a bootloader for the project \textit{moray white 2} you have to do the
|
||||
following steps:\\
|
||||
\begin{enumerate}
|
||||
\item Build project variant specific configuration
|
||||
\item Static code analysis of project variant specific configuration
|
||||
\item Name the release depending on the release naming convention
|
||||
\item Build release notes for the release candidate
|
||||
\item Deploy the release to the project's release candidate deploy
|
||||
location
|
||||
\item check/edit build job file
|
||||
\item check/edit configuration file
|
||||
\item create release tag in gitlab
|
||||
\end{enumerate}
|
||||
|
||||
\subsection{External release deployment} \label{sec:ci_ext}
|
||||
\subsection{Build job file}
|
||||
The build job file (\texttt{.gitlab-ci.yml}) could be found in the root
|
||||
directory of the repository. Here only the build configuration is done. In the
|
||||
\texttt{variables} Section the variable \texttt{PROJECT} contains the current
|
||||
build configuration.\\
|
||||
Possible build configurations:
|
||||
|
||||
To create an external release the commit to be released must be tagged
|
||||
using the following naming convention:\\
|
||||
\texttt{release/<project\_specific\_name>}.\\
|
||||
The project specific naming convention for Agricola ruby is:\\
|
||||
\texttt{release/174\_AG*}.\\
|
||||
|
||||
\begin{enumerate}
|
||||
\item Build project variant specific configuration
|
||||
\item Static code analysis of project variant specific configuration
|
||||
\item Name the release depending on the release naming convention
|
||||
\item Build release notes for the release
|
||||
\item Deploy the release to the project's release deploy location
|
||||
\end{enumerate}
|
||||
|
||||
\subsection{Release note generation} \label{sec:rel_note}
|
||||
|
||||
\begin{figure}
|
||||
\begin{center}
|
||||
\input{img_history.tex}
|
||||
\caption{Git commit history}
|
||||
\label{fig:git_commit_history}
|
||||
\end{center}
|
||||
\end{figure}
|
||||
|
||||
To generate release notes by commit messages special tagged commit messages
|
||||
are used. Release notes are generated for release candidats and releases.
|
||||
For release candidats (internal releases) more tags are analyzed. The
|
||||
definition of the commit tag rules are somewhere in the Polarion :) Because
|
||||
the release notes content is taken from the log history of a release branch
|
||||
each commit in it's history has to use tagged commits. To show logs only of
|
||||
direct parents (commits on the current release branch and commits on the
|
||||
master) the log command\\
|
||||
\texttt{git log <first\_commit>..HEAD --first parent master}\\
|
||||
can be used. Figure \ref{fig:git_commit_history} illustrates the flow of the
|
||||
log history of the release branch shown in figure \ref{fig:gitlab_workflow}.
|
||||
|
||||
\subsection{Configuring the build jobs} \label{sec:ci_conf}
|
||||
|
||||
The configuration of gitlab-ci is made in the \texttt{.gitlab-ci.yml} file
|
||||
in the root directory of the project's repository. The certain build stages
|
||||
are using variables to customize the build. These variables are defined in
|
||||
the \texttt{variables} section of the config file. Table \ref{tab:conf_var}
|
||||
and listing \ref{lst:ag_cfg} gives an overview about customizing a release
|
||||
phase.
|
||||
|
||||
\captionof{table}{Variables to customize a release phase}
|
||||
\label{tab:conf_var}
|
||||
\begin{tabular}{l l l}
|
||||
\cellcolor{black}\color{white}variable & \cellcolor{black}\color{white}meaning & \cellcolor{black}\color{white}example\\
|
||||
PRODUCT\_NAME & Short of the product name & AG\\
|
||||
PRODUCT\_VARIANT & Short of the product variant & NA\\
|
||||
PROJECT\_VERSION & ?? & 10\\
|
||||
SW\_MAJOR & Software major number & 1\\
|
||||
SW\_MINOR & Software minor number & 2\\\\
|
||||
\captionof{table}{Values for build configutation}
|
||||
\label{tab:var_build_confs}
|
||||
\begin{tabular}{l l}
|
||||
\cellcolor{black}\color{white}build config & \cellcolor{black}\color{white}meaning \\
|
||||
white2-dbg & use the debug configuration to build the release\\
|
||||
white2-rel & use the release configuration to build the release\\\\
|
||||
\end{tabular}
|
||||
\newline
|
||||
|
||||
\textbf{Example}
|
||||
\lstsetbash
|
||||
\begin{lstlisting}[caption=variables configuration, label=lst:ag_cfg]
|
||||
\begin{lstlisting}
|
||||
variables:
|
||||
PRODUCT_NAME: "AG"
|
||||
PRODUCT_VARIANT: "NA"
|
||||
PROJECT_VERSION: "10"
|
||||
SW_MAJOR: "1"
|
||||
SW_MINOR: "2"
|
||||
PROJECT: "white2-dbg"
|
||||
...
|
||||
\end{lstlisting}
|
||||
\begin{lstlisting}
|
||||
variables:
|
||||
PROJECT: "white2-rel"
|
||||
...
|
||||
\end{lstlisting}
|
||||
|
||||
\subsection{Configuration file}
|
||||
The configuration file (\texttt{configuration.xml}) depends on the build
|
||||
configuration (\texttt{white2-dbg} or \texttt{white2-rel}) and could be found
|
||||
in following folder (relative to the repositories root folder):\\
|
||||
\begin{lstlisting}
|
||||
moray/config/<build_config>/
|
||||
\end{lstlisting}
|
||||
Amongst others informations regarding version numbers, deploy file names and
|
||||
deploy locations are encapsulated in the \texttt{postlink} target.
|
||||
|
||||
\captionof{table}{Release relevant attributes in configuration file}
|
||||
\label{tab:conf_vars}
|
||||
\begin{tabular}{l l}
|
||||
\cellcolor{black}\color{white}attributes & \cellcolor{black}\color{white}meaning \\
|
||||
OUT\_EXECUTABLE\_NAME & file name for the bootloader executable\\
|
||||
REL\_VERSION & version numbering scheme\\
|
||||
OUT\_DEPLOY\_PATH & subversion link to deploy the release to\\\\
|
||||
\end{tabular}
|
||||
|
||||
It's usually enough to change \texttt{OUT\_EXECUTABLE\_NAME} and
|
||||
\texttt{REL\_VERSION} according to the release numbering scheme.\\\\
|
||||
|
||||
\textbf{Example}
|
||||
\begin{lstlisting}
|
||||
...
|
||||
<attribute name="OUT_EXECUTABLE_NAME"
|
||||
value="MO_BL_42_3.0.6_dbg.S19"/>
|
||||
<attribute name="REL_VERSION"
|
||||
value="42.3.0.6"/>
|
||||
<attribute name="OUT_DEPLOY_PATH"
|
||||
value="http://dabsvn01.internal.novero.com/svn/\
|
||||
0_31X_P0521_moray_white2/trunk/development/\
|
||||
software/releases/WTC/"/>
|
||||
...
|
||||
\end{lstlisting}
|
||||
\subsection{Create release tag in gitlab}
|
||||
To create a release candidate a tag in gitlab has to be created. Of course this
|
||||
could be done either locally (don't forget to push the tag) or by using the
|
||||
gitlab ui.
|
||||
\subsubsection{Release candidate}
|
||||
To create a release candidate the tag name must match the following regular
|
||||
expression:
|
||||
\begin{lstlisting}
|
||||
^release/white2/MO_BL_42_[0-9]+\.[0-9]+\.[0-9]+_RC[0-9]+
|
||||
\end{lstlisting}
|
||||
|
||||
\textbf{Example}
|
||||
\begin{lstlisting}
|
||||
release/white2/MO_BL_42_0.0.0_RC0
|
||||
release/white2/MO_BL_42_255.255.255_RC255
|
||||
\end{lstlisting}
|
||||
|
||||
\subsubsection{Release}
|
||||
To create a release the tag name must match the following regular expression:
|
||||
\begin{lstlisting}
|
||||
^release/white2/MO_BL_42_[0-9]+\.[0-9]+\.[0-9]+
|
||||
\end{lstlisting}
|
||||
|
||||
\textbf{Example}
|
||||
\begin{lstlisting}
|
||||
release/white2/MO_BL_42_0.0.0
|
||||
release/white2/MO_BL_42_255.255.255
|
||||
\end{lstlisting}
|
||||
|
||||
\textbf{Note:} Any tag which shouldn't trigger a release build must not match
|
||||
these regular expression rules.
|
||||
|
||||
\section{Application}
|
||||
For application building in the project \textit{moray white 2} the same steps as
|
||||
for bootloader building are necessary:\\
|
||||
\begin{enumerate}
|
||||
\item check/edit build job file
|
||||
\item check/edit configuration file
|
||||
\item create release tag in gitlab
|
||||
\end{enumerate}
|
||||
|
||||
\subsection{Build job file}
|
||||
The build job file (\texttt{.gitlab-ci.yml}) could be found in the root
|
||||
directory of the repository. Here only the build configuration is done. In the
|
||||
\texttt{variables} Section the variable \texttt{PROJECT} contains the current
|
||||
build configuration.\\
|
||||
Possible build configurations:
|
||||
|
||||
\captionof{table}{Values for build configutation}
|
||||
\label{tab:var_build_confs}
|
||||
\begin{tabular}{l l}
|
||||
\cellcolor{black}\color{white}build config & \cellcolor{black}\color{white}meaning \\
|
||||
white2-dbg & use the debug configuration to build the release\\
|
||||
white2-rel & use the release configuration to build the release\\\\
|
||||
\end{tabular}
|
||||
|
||||
\textbf{Example}
|
||||
\lstsetbash
|
||||
\begin{lstlisting}
|
||||
variables:
|
||||
PROJECT: "white2-dbg"
|
||||
...
|
||||
\end{lstlisting}
|
||||
\begin{lstlisting}
|
||||
variables:
|
||||
PROJECT: "white2-rel"
|
||||
...
|
||||
\end{lstlisting}
|
||||
|
||||
\subsection{Configuration file}
|
||||
The configuration file (\texttt{configuration.xml}) depends on the build
|
||||
configuration (\texttt{white2-dbg} or \texttt{white2-rel}) and could be found
|
||||
in following folder (relative to the repositories root folder):\\
|
||||
\begin{lstlisting}
|
||||
config/<build_config>/
|
||||
\end{lstlisting}
|
||||
Amongst others informations regarding version numbers, bootloader location,
|
||||
deploy file names and deploy locations are encapsulated in the \texttt{postlink}
|
||||
target.
|
||||
|
||||
\captionof{table}{Release relevant attributes in configuration file}
|
||||
\label{tab:conf_vars}
|
||||
\begin{tabular}{l l}
|
||||
\cellcolor{black}\color{white}attributes & \cellcolor{black}\color{white}meaning \\
|
||||
OUT\_EXECUTABLE\_NAME & file name for the bootloader executable\\
|
||||
REL\_VERSION & version numbering scheme\\
|
||||
IN\_BOOTLOADER\_URL & path to the bootloader url containing the\\
|
||||
& regarding bootloader executable\\
|
||||
OUT\_DEPLOY\_PATH & subversion link to deploy the release to\\\\
|
||||
\end{tabular}
|
||||
|
||||
It's usually enough to change \texttt{OUT\_EXECUTABLE\_NAME} and
|
||||
\texttt{REL\_VERSION} according to the release numbering scheme. Only in case of
|
||||
a changed bootloader the \texttt{IN\_BOOTLOADER\_URL} has to be changed.\\\\
|
||||
|
||||
\textbf{Example}
|
||||
\begin{lstlisting}
|
||||
...
|
||||
<attribute name="OUT_EXECUTABLE_NAME"
|
||||
value="MO_BL_42_3.0.6_dbg.S19"/>
|
||||
<attribute name="REL_VERSION"
|
||||
value="42.3.0.6"/>
|
||||
<attribute name="IN_BOOTLOADER_URL" value="http://\
|
||||
dabsvn01/svn/0_31X_P0521_moray_white2/trunk/\
|
||||
development/software/releases/WTC/Bootloader/\
|
||||
MO_BL_42_3.1.6.S19"/>
|
||||
<attribute name="OUT_DEPLOY_PATH"
|
||||
value="http://dabsvn01.internal.novero.com/svn/\
|
||||
0_31X_P0521_moray_white2/trunk/development/\
|
||||
software/releases/WTC/"/>
|
||||
...
|
||||
\end{lstlisting}
|
||||
\subsection{Create release tag in gitlab}
|
||||
To create a release candidate a tag in gitlab has to be created. Of course this
|
||||
could be done either locally (don't forget to push the tag) or by using the
|
||||
gitlab ui.
|
||||
\subsubsection{Release candidate}
|
||||
To create a release candidate the tag name must match the following regular
|
||||
expression:
|
||||
\begin{lstlisting}
|
||||
^release/white2/MO_WC_42_[0-9]+\.[0-9]+\.[0-9]+_RC[0-9]+
|
||||
\end{lstlisting}
|
||||
|
||||
\textbf{Example}
|
||||
\begin{lstlisting}
|
||||
release/white2/MO_WC_42_0.0.0_RC0
|
||||
release/white2/MO_WC_42_255.255.255_RC255
|
||||
\end{lstlisting}
|
||||
|
||||
\subsubsection{Release}
|
||||
To create a release the tag name must match the following regular expression:
|
||||
\begin{lstlisting}
|
||||
^release/white2/MO_WC_42_[0-9]+\.[0-9]+\.[0-9]+
|
||||
\end{lstlisting}
|
||||
|
||||
\textbf{Example}
|
||||
\begin{lstlisting}
|
||||
release/white2/MO_WC_42_0.0.0
|
||||
release/white2/MO_WC_42_255.255.255
|
||||
\end{lstlisting}
|
||||
|
||||
\textbf{Note:} Any tag which shouldn't trigger a release build must not match
|
||||
these regular expression rules.
|
||||
|
||||
|
||||
@@ -1,97 +0,0 @@
|
||||
\psset{griddots=0,gridlabels=8pt,subgriddiv=5}
|
||||
\psset{xunit=10mm,yunit=10mm}
|
||||
\begin{pspicture}(12,10)
|
||||
% \psgrid
|
||||
\newcommand{\clr}{black}
|
||||
% phases
|
||||
\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](0,2)(12,2)
|
||||
\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](0,8)(12,8)
|
||||
\rput{0}(1.5,2){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\clr}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\clr}{code freeze}}
|
||||
}
|
||||
\psline[linewidth=1pt,linecolor=\clr]{<->}(11.5,2)(11.5,8)
|
||||
\rput{90}(11.5,5){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\clr}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\clr}{release phase}}
|
||||
}
|
||||
|
||||
|
||||
% master
|
||||
\newcommand{\masterx}{10}
|
||||
\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\masterx,1)(\masterx,9)
|
||||
\psset{fillcolor=\clr}
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,2)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,8)
|
||||
\rput(\masterx,0.5){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\clr}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\clr}{master}}
|
||||
}
|
||||
% feature/anti_osc
|
||||
\renewcommand{\clr}{RedOrange}
|
||||
\newcommand{\featurex}{8}
|
||||
\psline[linewidth=2pt,linecolor=\clr](\masterx,2)(\featurex,3)
|
||||
\psline[linewidth=2pt,linecolor=\clr](\featurex,3)(\featurex,7)
|
||||
\psline[linewidth=2pt,linecolor=\clr,linestyle=dashed,arrowsize=15pt]{->}(\featurex,7)(\masterx,8)
|
||||
\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\featurex,2)(\featurex,8)
|
||||
\multido{\nA=3+2}{3}{
|
||||
\psset{fillcolor=\clr}
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\featurex,\nA)
|
||||
}
|
||||
\rput(\featurex,1.5){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\clr}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\clr}{release/NAR\_C0}}
|
||||
}
|
||||
\newcommand{\rccolor}{Blue}
|
||||
\psset{fillcolor=\rccolor}
|
||||
\psdot[dotsize=5pt,dotstyle=o,linecolor=\rccolor](\masterx,2)
|
||||
\psdot[dotsize=5pt,dotstyle=o,linecolor=\rccolor](\featurex,3)
|
||||
\psdot[dotsize=5pt,dotstyle=o,linecolor=\rccolor](\featurex,5)
|
||||
\psline[linewidth=1pt,linecolor=\rccolor,arrowsize=10pt]{->}(\masterx,2)(5.7,2.8)
|
||||
\psline[linewidth=1pt,linecolor=\rccolor,arrowsize=10pt]{->}(\featurex,3)(5.7,4.6)
|
||||
\psline[linewidth=1pt,linecolor=\rccolor,arrowsize=10pt]{->}(\featurex,5)(5.7,6.6)
|
||||
\rput(3,3){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\rccolor}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\rccolor}{deploy: release candidate 1}}
|
||||
}
|
||||
\rput(3,5){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\rccolor}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\rccolor}{deploy: release candidate 2}}
|
||||
}
|
||||
\rput(3,7){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\rccolor}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\rccolor}{deploy: release candidate 3}}
|
||||
}
|
||||
\newcommand{\rcolor}{ForestGreen}
|
||||
\psset{fillcolor=\rcolor}
|
||||
\psdot[dotsize=5pt,dotstyle=o,linecolor=\rcolor](\featurex,7)
|
||||
\psline[linewidth=1pt,linecolor=\rcolor,arrowsize=10pt]{->}(\featurex,7)(4.6,8.6)
|
||||
\rput(3,9){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\rcolor}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\rcolor}{deploy: release}}
|
||||
}
|
||||
\end{pspicture}
|
||||
136
img_gitlab.tex
136
img_gitlab.tex
@@ -1,136 +0,0 @@
|
||||
\psset{griddots=0,gridlabels=8pt,subgriddiv=5}
|
||||
\psset{xunit=10mm,yunit=10mm}
|
||||
\begin{pspicture}(14,16)
|
||||
% \psgrid
|
||||
\newcommand{\clr}{black}
|
||||
% phases
|
||||
\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](0,2)(14,2)
|
||||
\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](0,8)(14,8)
|
||||
\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](0,14)(14,14)
|
||||
\rput{0}(1.5,8){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\clr}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\clr}{code freeze}}
|
||||
}
|
||||
\psline[linewidth=1pt,linecolor=\clr]{<->}(13.5,2)(13.5,8)
|
||||
\rput{90}(13.5,5){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\clr}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\clr}{implementation phase}}
|
||||
}
|
||||
\psline[linewidth=1pt,linecolor=\clr]{<->}(13.5,8)(13.5,14)
|
||||
\rput{90}(13.5,11){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\clr}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\clr}{release phase}}
|
||||
}
|
||||
|
||||
|
||||
% master
|
||||
\newcommand{\masterx}{7}
|
||||
\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\masterx,1)(\masterx,15)
|
||||
\psset{fillcolor=\clr}
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,2)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,3)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,7)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,8)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\masterx,14)
|
||||
\rput(\masterx,0.5){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\clr}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\clr}{master}}
|
||||
}
|
||||
% feature/anti_osc
|
||||
\renewcommand{\clr}{ForestGreen}
|
||||
\newcommand{\featurex}{5}
|
||||
\psline[linewidth=2pt,linecolor=\clr](\masterx,2)(\featurex,3)
|
||||
\psline[linewidth=2pt,linecolor=\clr](\featurex,3)(\featurex,7)
|
||||
\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\featurex,7)(\masterx,8)
|
||||
\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\featurex,2)(\featurex,8)
|
||||
\multido{\nA=3+2}{3}{
|
||||
\psset{fillcolor=\clr}
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\featurex,\nA)
|
||||
}
|
||||
\rput(\featurex,1.5){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\clr}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\clr}{feature/anti\_osc}}
|
||||
}
|
||||
% old_branch
|
||||
\renewcommand{\clr}{Gray}
|
||||
\newcommand{\xpos}{9}
|
||||
\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\xpos,2)(\masterx,3)
|
||||
\psline[linewidth=2pt,linecolor=\clr](\xpos,1)(\xpos,2)
|
||||
|
||||
% fix/calibration_crc
|
||||
\renewcommand{\clr}{Maroon}
|
||||
\newcommand{\fixx}{9}
|
||||
\psline[linewidth=2pt,linecolor=\clr](\masterx,3)(\fixx,4)
|
||||
\psline[linewidth=2pt,linecolor=\clr](\fixx,4)(\fixx,6)
|
||||
\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,6)(\masterx,7)
|
||||
\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\fixx,3)(\fixx,7)
|
||||
\multido{\nA=4+2}{2}{
|
||||
\psset{fillcolor=\clr}
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,\nA)
|
||||
}
|
||||
\rput(\fixx,2.5){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\clr}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\clr}{fix/calibration\_crc}}
|
||||
}
|
||||
% feature/dynamic_monitoring
|
||||
\renewcommand{\clr}{RoyalBlue}
|
||||
\renewcommand{\fixx}{11}
|
||||
\psline[linewidth=2pt,linecolor=\clr](\masterx,3)(\fixx,4)
|
||||
\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,4)(\fixx,12)
|
||||
\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\fixx,3)(\fixx,4)
|
||||
\rput(\fixx,12.5){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\clr}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\clr}{feature/dyn\_mon}}
|
||||
}
|
||||
\psset{fillcolor=\clr}
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,4)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,6)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,8)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,10)
|
||||
% release/NAR_C0
|
||||
\renewcommand{\clr}{RedOrange}
|
||||
\renewcommand{\fixx}{5}
|
||||
\psline[linewidth=2pt,linecolor=\clr](\masterx,8)(\fixx,9)
|
||||
\psline[linewidth=2pt,linecolor=\clr](\fixx,9)(\fixx,13)
|
||||
\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\fixx,8)(\fixx,14)
|
||||
\psline[linewidth=2pt,linecolor=\clr,linestyle=dashed,arrowsize=15pt]{->}(\fixx,13)(\masterx,14)
|
||||
\rput(\fixx,14.5){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\clr}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\clr}{release/NAR\_C0}}
|
||||
}
|
||||
\rput(2.5,13){
|
||||
\psset{fillcolor=\clr}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\clr}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{white}{\shortstack{tags/release/\\174\_AG\_NA\_10-01.02}}}
|
||||
}
|
||||
\psset{fillcolor=\clr}
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,9)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,11)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,13)
|
||||
\end{pspicture}
|
||||
@@ -1,74 +0,0 @@
|
||||
\psset{griddots=0,gridlabels=8pt,subgriddiv=5}
|
||||
\psset{xunit=10mm,yunit=10mm}
|
||||
\begin{pspicture}(14,16)
|
||||
% \psgrid
|
||||
\newcommand{\clr}{Gray}
|
||||
\newcommand{\bclr}{RedOrange}
|
||||
\newcommand{\hclr}{Blue}
|
||||
\newcommand{\mclr}{black}
|
||||
|
||||
% master
|
||||
\newcommand{\masterx}{7}
|
||||
\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\masterx,8)(\masterx,15)
|
||||
\psline[linewidth=2pt,linecolor=\hclr](\masterx,1)(\masterx,8)
|
||||
\psset{fillcolor=\hclr}
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\masterx,2)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\masterx,3)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\masterx,7)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\masterx,8)
|
||||
\rput(\masterx,0.5){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\mclr}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\mclr}{master}}
|
||||
}
|
||||
% feature/anti_osc
|
||||
\newcommand{\featurex}{5}
|
||||
\psline[linewidth=2pt,linecolor=\clr](\masterx,2)(\featurex,3)
|
||||
\psline[linewidth=2pt,linecolor=\clr](\featurex,3)(\featurex,7)
|
||||
\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\featurex,7)(\masterx,8)
|
||||
\multido{\nA=3+2}{3}{
|
||||
\psset{fillcolor=\clr}
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\featurex,\nA)
|
||||
}
|
||||
% old_branch
|
||||
\newcommand{\xpos}{9}
|
||||
\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\xpos,2)(\masterx,3)
|
||||
\psline[linewidth=2pt,linecolor=\clr](\xpos,1)(\xpos,2)
|
||||
|
||||
% fix/calibration_crc
|
||||
\newcommand{\fixx}{9}
|
||||
\psline[linewidth=2pt,linecolor=\clr](\masterx,3)(\fixx,4)
|
||||
\psline[linewidth=2pt,linecolor=\clr](\fixx,4)(\fixx,6)
|
||||
\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,6)(\masterx,7)
|
||||
\multido{\nA=4+2}{2}{
|
||||
\psset{fillcolor=\clr}
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,\nA)
|
||||
}
|
||||
% feature/dynamic_monitoring
|
||||
\renewcommand{\fixx}{11}
|
||||
\psline[linewidth=2pt,linecolor=\clr](\masterx,3)(\fixx,4)
|
||||
\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,4)(\fixx,12)
|
||||
\psset{fillcolor=\clr}
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,4)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,6)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,8)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,10)
|
||||
% release/NAR_C0
|
||||
\renewcommand{\fixx}{5}
|
||||
\psline[linewidth=1pt,linecolor=\bclr,linestyle=dashed](\fixx,8)(\fixx,14)
|
||||
\psline[linewidth=2pt,linecolor=\hclr](\masterx,8)(\fixx,9)
|
||||
\psline[linewidth=2pt,linecolor=\hclr](\fixx,9)(\fixx,13)
|
||||
\rput(\fixx,14.5){
|
||||
\psset{fillcolor=white}
|
||||
\psset{fillstyle=solid}
|
||||
\psset{linecolor=\bclr}
|
||||
\psset{framearc=.5}
|
||||
\psframebox{\textcolor{\bclr}{release/NAR\_C0}}
|
||||
}
|
||||
\psset{fillcolor=\hclr}
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\fixx,9)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\fixx,11)
|
||||
\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\fixx,13)
|
||||
\end{pspicture}
|
||||
Reference in New Issue
Block a user