Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Remove LFN process jobs"
[releng/builder.git]
/
jjb
/
autorelease
/
autorelease-macros.yaml
diff --git
a/jjb/autorelease/autorelease-macros.yaml
b/jjb/autorelease/autorelease-macros.yaml
index e6bf110b6c3e1a3a3fc09929e84bfb4f878135af..a1ab67240d25d3d05c23d53144427b6fb6de22b0 100644
(file)
--- a/
jjb/autorelease/autorelease-macros.yaml
+++ b/
jjb/autorelease/autorelease-macros.yaml
@@
-20,7
+20,7
@@
name: autorelease-checkout-gerrit-patch
builders:
- shell: |
name: autorelease-checkout-gerrit-patch
builders:
- shell: |
- #!/bin/bash
+ #!/bin/bash
-l
set -eu -o pipefail
# If the project is autorelease then we do not need to cd
set -eu -o pipefail
# If the project is autorelease then we do not need to cd
@@
-39,35
+39,21
@@
git clean -dff
fi
git clean -dff
fi
-- builder:
- name: autorelease-cfp
- builders:
- - config-file-provider:
- files:
- - file-id: 'autorelease-settings'
- variable: 'SETTINGS_FILE'
- - file-id: 'global-settings'
- variable: 'GLOBAL_SETTINGS_FILE'
-
- builder:
name: autorelease-determine-merge-order
builders:
- shell: |
- builder:
name: autorelease-determine-merge-order
builders:
- shell: |
- virtualenv --system-site-packages $WORKSPACE/venv
+ #!/bin/bash -l
+ set -xe -o pipefail
+ virtualenv -p python3 --system-site-packages $WORKSPACE/venv
source $WORKSPACE/venv/bin/activate
PYTHON="$WORKSPACE/venv/bin/python"
source $WORKSPACE/venv/bin/activate
PYTHON="$WORKSPACE/venv/bin/python"
- $PYTHON -m pip install --upgrade "pip<10.0.0" setuptools
$PYTHON -m pip install --upgrade networkx
$PYTHON -m pip freeze
./scripts/determine-merge-order.py
deactivate
rm -rf $WORKSPACE/venv
$PYTHON -m pip install --upgrade networkx
$PYTHON -m pip freeze
./scripts/determine-merge-order.py
deactivate
rm -rf $WORKSPACE/venv
-- builder:
- name: autorelease-maven-deploy
- builders:
- - shell: !include-raw: autorelease-maven-deploy.sh
-
- builder:
name: autorelease-maven-sources
builders:
- builder:
name: autorelease-maven-sources
builders:
@@
-81,15
+67,11
@@
-DappendOutput
{opendaylight-infra-mvn-opts}
java-opts:
-DappendOutput
{opendaylight-infra-mvn-opts}
java-opts:
- - '-Xmx4096m
-XX:MaxPermSize=1024m
'
+ - '-Xmx4096m'
settings: '{settings}'
settings-type: cfp
global-settings: '{global-settings}'
global-settings-type: cfp
settings: '{settings}'
settings-type: cfp
global-settings: '{global-settings}'
global-settings-type: cfp
-
-- builder:
- name: autorelease-maven-sources-post-process
- builders:
- shell: |
awk '/The following files have NOT been resolved:/,/^$/' sources.log > missing-sources.log
- shell: |
awk '/The following files have NOT been resolved:/,/^$/' sources.log > missing-sources.log
@@
-98,7
+80,7
@@
builders:
- integration-set-variables
- shell: |
builders:
- integration-set-variables
- shell: |
- #!/bin/bash
+ #!/bin/bash
-l
set +e # DO NOT fail build if copying fails.
cp -vf "$WORKSPACE/archives/patches/taglist.log" \
set +e # DO NOT fail build if copying fails.
cp -vf "$WORKSPACE/archives/patches/taglist.log" \
@@
-112,7
+94,7
@@
# Generate versions.csv containing version of all mvn artifacts in this build.
builders:
- shell: |
# Generate versions.csv containing version of all mvn artifacts in this build.
builders:
- shell: |
- #!/bin/bash
+ #!/bin/bash
-l
set -eu -o pipefail
./scripts/generate-artifact-versions.sh
mkdir -p "$WORKSPACE/archives"
set -eu -o pipefail
./scripts/generate-artifact-versions.sh
mkdir -p "$WORKSPACE/archives"
@@
-122,7
+104,6
@@
name: autorelease-generate-release-patches
builders:
- shell: !include-raw:
name: autorelease-generate-release-patches
builders:
- shell: !include-raw:
- - ../global-jjb/shell/lftools-install.sh
- prepare-release.sh
- builder:
- prepare-release.sh
- builder: