diff options
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 3 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yaml | 2 | ||||
| -rw-r--r-- | releases/gambia/apex.yaml | 8 | ||||
| -rw-r--r-- | releases/gambia/armband.yaml | 3 | ||||
| -rw-r--r-- | releases/gambia/compass4nfv.yaml | 14 | ||||
| -rw-r--r-- | releases/gambia/fuel.yaml | 3 | ||||
| -rw-r--r-- | releases/gambia/samplevnf.yaml | 3 |
7 files changed, 32 insertions, 4 deletions
diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index 8bc5fa268..418b814e5 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -19,9 +19,6 @@ LAB_NAME=${NODE_NAME/-*} # shellcheck disable=SC2153 POD_NAME=${NODE_NAME/*-} -# define Docker tag for stable branches -[[ "${BRANCH}" != master ]] && export MCP_DOCKER_TAG=${BRANCH##*/} - # Fuel currently supports arm, enea, ericsson, intel, lf, unh and zte labs if [[ ! "${LAB_NAME}" =~ (arm|enea|ericsson|intel|lf|unh|zte) ]]; then echo "Unsupported/unidentified lab ${LAB_NAME}. Cannot continue!" diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index 17235b37d..1f7366688 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -302,7 +302,7 @@ <<: *other-receivers - 'bottlenecks': project: 'bottlenecks' - <<: *euphrates + <<: *gambia <<: *other-receivers - 'nfvbench': project: 'nfvbench' diff --git a/releases/gambia/apex.yaml b/releases/gambia/apex.yaml index fada4cbb1..d9bed66db 100644 --- a/releases/gambia/apex.yaml +++ b/releases/gambia/apex.yaml @@ -12,6 +12,14 @@ project-type: installer release-model: stable upstream: https://wiki.openstack.org/wiki/TripleO +releases: + - version: opnfv-7.0.0 + location: + apex: de387870dfc45fa9a9b066bbfe1c96c731cb086b + - version: opnfv-7.1.0 + location: + apex: 06da44b76d254987d41b083960b2f3637175a791 + branches: - name: stable/gambia location: diff --git a/releases/gambia/armband.yaml b/releases/gambia/armband.yaml index 2e5f65af5..a523d5a40 100644 --- a/releases/gambia/armband.yaml +++ b/releases/gambia/armband.yaml @@ -15,6 +15,9 @@ releases: - version: opnfv-7.0.0 location: armband: 30027365166c204bc03043234bbc6b0dfc2506fb + - version: opnfv-7.1.0 + location: + armband: 5d8dd94fd0a50d9899010eb764e94abcb05b38c7 branches: - name: stable/gambia diff --git a/releases/gambia/compass4nfv.yaml b/releases/gambia/compass4nfv.yaml index e0523889c..baf1fdea4 100644 --- a/releases/gambia/compass4nfv.yaml +++ b/releases/gambia/compass4nfv.yaml @@ -10,3 +10,17 @@ branches: - name: stable/gambia location: compass-containers: 20e229822b31b03e1120c3e5efd4ba131261617e + +releases: + - version: opnfv-7.0.0 + location: + compass4nfv: 33f94b43639dbe37b7e8e2b5eeb4c65064207c6b + - version: opnfv-7.0.0 + location: + compass-containers: 20e229822b31b03e1120c3e5efd4ba131261617e + - version: opnfv-7.1.0 + location: + compass4nfv: 5838841f09950160f907e15fc14282449f6652af + - version: opnfv-7.1.0 + location: + compass-containers: c8fd057f2752713a21d093f5255348e2b183871e diff --git a/releases/gambia/fuel.yaml b/releases/gambia/fuel.yaml index a958209b0..3a60effb8 100644 --- a/releases/gambia/fuel.yaml +++ b/releases/gambia/fuel.yaml @@ -20,5 +20,8 @@ releases: - version: opnfv-7.0.0 location: fuel: 326c26b9b89c23e9775ba287d9da3bea35cfc437 + - version: opnfv-7.1.0 + location: + fuel: 79c56150533ec77e73bede445e74960affbbef67 release-notes: https://opnfv-fuel.readthedocs.io/en/latest/release/release-notes/release-notes.html diff --git a/releases/gambia/samplevnf.yaml b/releases/gambia/samplevnf.yaml index a53eaa409..0d9500e7f 100644 --- a/releases/gambia/samplevnf.yaml +++ b/releases/gambia/samplevnf.yaml @@ -10,6 +10,9 @@ releases: - version: opnfv-7.0.1 location: samplevnf: 9c29c90931b7fbc1690508769f1f7a7898dbf015 + - version: opnfv-7.1.0 + location: + samplevnf: 9c29c90931b7fbc1690508769f1f7a7898dbf015 branches: - name: stable/gambia |