summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/opnfv/opnfv-docker.sh7
-rw-r--r--jjb/releng-macros.yaml20
-rw-r--r--prototypes/puppet-infracloud/README.md19
3 files changed, 28 insertions, 18 deletions
diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh
index 860eee05d..07198c608 100644
--- a/jjb/opnfv/opnfv-docker.sh
+++ b/jjb/opnfv/opnfv-docker.sh
@@ -110,7 +110,12 @@ echo "Tag version to be build and pushed: $DOCKER_TAG"
# Start the build
echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG"
-docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG --build-arg BRANCH=$branch .
+if [[ $DOCKER_REPO_NAME == *"functest"* ]]; then
+ docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG --build-arg BRANCH=$branch .
+else
+ docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG .
+fi
+
echo "Creating tag '$DOCKER_TAG'..."
docker tag -f $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG $DOCKER_REPO_NAME:$DOCKER_TAG
diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index eb4ee52bd..2aa775fd6 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -209,12 +209,10 @@
mv docs_output "$local_path"
gsutil -m cp -r "$local_path" "gs://$gs_base"
- if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then
- gsutil -m setmeta \
- -h "Content-Type:text/html" \
- -h "Cache-Control:private, max-age=0, no-transform" \
- "gs://$gs_path"/**.html
- fi
+ gsutil -m setmeta \
+ -h "Content-Type:text/html" \
+ -h "Cache-Control:private, max-age=0, no-transform" \
+ "gs://$gs_path"/**.html > /dev/null 2>&1
echo "Document link(s):" >> gerrit_comment.txt
find "$local_path" | grep -e 'index.html$' -e 'pdf$' | \
@@ -245,12 +243,10 @@
mv docs_output "$local_path"
gsutil -m cp -r "$local_path" "gs://$GS_URL"
- if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then
- gsutil -m setmeta \
- -h "Content-Type:text/html" \
- -h "Cache-Control:private, max-age=0, no-transform" \
- "gs://$gs_path"/**.html
- fi
+ gsutil -m setmeta \
+ -h "Content-Type:text/html" \
+ -h "Cache-Control:private, max-age=0, no-transform" \
+ "gs://$gs_path"/**.html > /dev/null 2>&1
echo "Document link(s):" >> gerrit_comment.txt
find "$local_path" | grep -e 'index.html$' -e 'pdf$' | \
diff --git a/prototypes/puppet-infracloud/README.md b/prototypes/puppet-infracloud/README.md
index dd9e7bb9f..37d575c33 100644
--- a/prototypes/puppet-infracloud/README.md
+++ b/prototypes/puppet-infracloud/README.md
@@ -31,7 +31,7 @@ In jumphost, follow that steps:
git clone https://gerrit.opnfv.org/gerrit/releng /opt/releng
-2. Create OpenStack clouds config directory:
+2. Create OpenStack clouds config directory::
mkdir -p /root/.config/openstack
@@ -39,14 +39,23 @@ In jumphost, follow that steps:
cp /opt/releng/prototypes/puppet-infracloud/creds/clouds.yaml /root/.config/openstack/
-4. Install openstack-client:
+4. Install python-dev package as the installation of python-openstackclient depends on it
+
+ apt-get install -y python-dev
+
+5. Install openstack-client. (version 3.2.0 is known to work)::
pip install python-openstackclient
-5. Export the desired cloud::
+6. Update /etc/hosts and add controller00::
+
+ 192.168.122.3 controller00
+ 192.168.122.3 controller00.opnfvlocal controller00
+
+7. Export the desired cloud::
export OS_CLOUD=opnfv
-6. Start using it::
+8. Start using it::
- openstack server list
+ openstack service list